diff options
| author | David S. Miller <davem@davemloft.net> | 2014-10-08 22:22:22 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-08 22:22:22 +0200 |
| commit | 64b1f00a0830e1c53874067273a096b228d83d36 (patch) | |
| tree | dd547b0f1d431d0995b8eaa711cedb92399f31fe /net/bridge/br_private.h | |
| parent | netlabel: directly return netlbl_unlabel_genl_init() (diff) | |
| parent | net_sched: copy exts->type in tcf_exts_change() (diff) | |
| download | linux-64b1f00a0830e1c53874067273a096b228d83d36.tar.xz linux-64b1f00a0830e1c53874067273a096b228d83d36.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/bridge/br_private.h')
| -rw-r--r-- | net/bridge/br_private.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index d8cbaa694227..4d783d071305 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -306,10 +306,14 @@ struct net_bridge struct br_input_skb_cb { struct net_device *brdev; + #ifdef CONFIG_BRIDGE_IGMP_SNOOPING int igmp; int mrouters_only; #endif + + u16 frag_max_size; + #ifdef CONFIG_BRIDGE_VLAN_FILTERING bool vlan_filtered; #endif |