diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-15 10:53:14 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-15 10:53:14 +0200 |
| commit | bb12d86e9fa99cc23927d5c90b125c31534ecf14 (patch) | |
| tree | 9d7a6d3b4a13323863d3799ba289e120ff698d38 /net/bridge/br_private.h | |
| parent | 51e809ee973d95a49753d554753e1c65a507b0b2 (diff) | |
| parent | af4733b50b52d6112c15a2f0253954fc244a81ca (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Diffstat (limited to 'net/bridge/br_private.h')
| -rw-r--r-- | net/bridge/br_private.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index f2d254b69353..4acfc3eef56a 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -302,6 +302,9 @@ struct br_input_skb_cb { int igmp; int mrouters_only; #endif +#ifdef CONFIG_BRIDGE_VLAN_FILTERING + bool vlan_filtered; +#endif }; #define BR_INPUT_SKB_CB(__skb) ((struct br_input_skb_cb *)(__skb)->cb) |