diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-07-31 08:49:09 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-07-31 08:49:09 -0700 |
| commit | fa9586aff919a93761a76feb69718b54d49fdd8e (patch) | |
| tree | 1bcc1afd7642464740c1f7486eaf22f0c09977a6 /net/netfilter/ipset/ip_set_bitmap_ipmac.c | |
| parent | net: ag71xx: Use GFP_KERNEL instead of GFP_ATOMIC in 'ag71xx_rings_init()' (diff) | |
| parent | Merge branch 'master' of git://blackhole.kfki.hu/nf (diff) | |
| download | linux-dev-fa9586aff919a93761a76feb69718b54d49fdd8e.tar.xz linux-dev-fa9586aff919a93761a76feb69718b54d49fdd8e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
netfilter fixes for net
The following patchset contains Netfilter fixes for your net tree:
1) memleak in ebtables from the error path for the 32/64 compat layer,
from Florian Westphal.
2) Fix inverted meta ifname/ifidx matching when no interface is set
on either from the input/output path, from Phil Sutter.
3) Remove goto label in nft_meta_bridge, also from Phil.
4) Missing include guard in xt_connlabel, from Masahiro Yamada.
5) Two patch to fix ipset destination MAC matching coming from
Stephano Brivio, via Jozsef Kadlecsik.
6) Fix set rename and listing concurrency problem, from Shijie Luo.
Patch also coming via Jozsef Kadlecsik.
7) ebtables 32/64 compat missing base chain policy in rule count,
from Florian Westphal.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/ipset/ip_set_bitmap_ipmac.c')
| -rw-r--r-- | net/netfilter/ipset/ip_set_bitmap_ipmac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/ipset/ip_set_bitmap_ipmac.c b/net/netfilter/ipset/ip_set_bitmap_ipmac.c index ca7ac4a25ada..1d4e63326e68 100644 --- a/net/netfilter/ipset/ip_set_bitmap_ipmac.c +++ b/net/netfilter/ipset/ip_set_bitmap_ipmac.c @@ -226,7 +226,7 @@ bitmap_ipmac_kadt(struct ip_set *set, const struct sk_buff *skb, e.id = ip_to_id(map, ip); - if (opt->flags & IPSET_DIM_ONE_SRC) + if (opt->flags & IPSET_DIM_TWO_SRC) ether_addr_copy(e.ether, eth_hdr(skb)->h_source); else ether_addr_copy(e.ether, eth_hdr(skb)->h_dest); |