diff options
| author | Florian Westphal | 2015-04-02 14:31:44 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2015-04-08 16:49:11 +0200 |
| commit | 3eaf402502e49ad9c58c73e8599c7c4f345d62da (patch) | |
| tree | df5d4e77678c1793f11fdf828c0a98645314674c /include/linux/netfilter_bridge.h | |
| parent | netfilter: bridge: add and use nf_bridge_info_get helper (diff) | |
| download | kernel-qcow2-linux-3eaf402502e49ad9c58c73e8599c7c4f345d62da.tar.gz kernel-qcow2-linux-3eaf402502e49ad9c58c73e8599c7c4f345d62da.tar.xz kernel-qcow2-linux-3eaf402502e49ad9c58c73e8599c7c4f345d62da.zip | |
netfilter: bridge: start splitting mask into public/private chunks
->mask is a bit info field that mixes various use cases.
In particular, we have flags that are mutually exlusive, and flags that
are only used within br_netfilter while others need to be exposed to
other parts of the kernel.
Remove BRNF_8021Q/PPPoE flags. They're mutually exclusive and only
needed within br_netfilter context.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/linux/netfilter_bridge.h')
| -rw-r--r-- | include/linux/netfilter_bridge.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/netfilter_bridge.h b/include/linux/netfilter_bridge.h index e1d96bc2767c..d47a32dffa15 100644 --- a/include/linux/netfilter_bridge.h +++ b/include/linux/netfilter_bridge.h @@ -20,12 +20,10 @@ enum nf_br_hook_priorities { #define BRNF_PKT_TYPE 0x01 #define BRNF_BRIDGED_DNAT 0x02 #define BRNF_NF_BRIDGE_PREROUTING 0x08 -#define BRNF_8021Q 0x10 -#define BRNF_PPPoE 0x20 static inline unsigned int nf_bridge_mtu_reduction(const struct sk_buff *skb) { - if (unlikely(skb->nf_bridge->mask & BRNF_PPPoE)) + if (skb->nf_bridge->orig_proto == BRNF_PROTO_PPPOE) return PPPOE_SES_HLEN; return 0; } |