diff options
| author | David S. Miller <davem@davemloft.net> | 2016-04-08 22:42:31 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-08 22:42:31 +0200 |
| commit | 1089ac69776795074edb48ac15b8f6a36933bc0e (patch) | |
| tree | b4cb04ad95e9c9defc22bad95f26fa99d8ea43cd /net/netfilter | |
| parent | bpf, verifier: further improve search pruning (diff) | |
| parent | cfg80211: Allow reassociation to be requested with internal SME (diff) | |
| download | linux-1089ac69776795074edb48ac15b8f6a36933bc0e.tar.xz linux-1089ac69776795074edb48ac15b8f6a36933bc0e.zip | |
Merge tag 'mac80211-next-for-davem-2016-04-06' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
For the 4.7 cycle, we have a number of changes:
* Bob's mesh mode rhashtable conversion, this includes
the rhashtable API change for allocation flags
* BSSID scan, connect() command reassoc support (Jouni)
* fast (optimised data only) and support for RSS in mac80211 (myself)
* various smaller changes
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/nft_hash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nft_hash.c b/net/netfilter/nft_hash.c index 3f9d45d3d9b7..6fa016564f90 100644 --- a/net/netfilter/nft_hash.c +++ b/net/netfilter/nft_hash.c @@ -192,7 +192,7 @@ static void nft_hash_walk(const struct nft_ctx *ctx, const struct nft_set *set, u8 genmask = nft_genmask_cur(read_pnet(&set->pnet)); int err; - err = rhashtable_walk_init(&priv->ht, &hti); + err = rhashtable_walk_init(&priv->ht, &hti, GFP_KERNEL); iter->err = err; if (err) return; @@ -248,7 +248,7 @@ static void nft_hash_gc(struct work_struct *work) priv = container_of(work, struct nft_hash, gc_work.work); set = nft_set_container_of(priv); - err = rhashtable_walk_init(&priv->ht, &hti); + err = rhashtable_walk_init(&priv->ht, &hti, GFP_KERNEL); if (err) goto schedule; |