diff options
author | Jiri Pirko <jpirko@redhat.com> | 2010-06-15 02:50:45 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-15 14:48:58 -0400 |
commit | f350a0a87374418635689471606454abc7beaa3a (patch) | |
tree | c8210542a9848f6b5953b58d2ba1dbfb11715f14 /include/linux/netdevice.h | |
parent | a35e2c1b6d90544b3c688783869817628e5f9607 (diff) |
bridge: use rx_handler_data pointer to store net_bridge_port pointer
Register net_bridge_port pointer as rx_handler data pointer. As br_port is
removed from struct net_device, another netdev priv_flag is added to indicate
the device serves as a bridge port. Also rcuized pointers are now correctly
dereferenced in br_fdb.c and in netfilter parts.
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r-- | include/linux/netdevice.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 5f231de2032f..a7e0458029b5 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -1047,8 +1047,6 @@ struct net_device { | |||
1047 | /* mid-layer private */ | 1047 | /* mid-layer private */ |
1048 | void *ml_priv; | 1048 | void *ml_priv; |
1049 | 1049 | ||
1050 | /* bridge stuff */ | ||
1051 | struct net_bridge_port *br_port; | ||
1052 | /* GARP */ | 1050 | /* GARP */ |
1053 | struct garp_port *garp_port; | 1051 | struct garp_port *garp_port; |
1054 | 1052 | ||