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 /net/core | |
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 'net/core')
-rw-r--r-- | net/core/dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index abdb19e547a7..5902426ef585 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -2765,7 +2765,8 @@ int __skb_bond_should_drop(struct sk_buff *skb, struct net_device *master) | |||
2765 | if (master->priv_flags & IFF_MASTER_ARPMON) | 2765 | if (master->priv_flags & IFF_MASTER_ARPMON) |
2766 | dev->last_rx = jiffies; | 2766 | dev->last_rx = jiffies; |
2767 | 2767 | ||
2768 | if ((master->priv_flags & IFF_MASTER_ALB) && master->br_port) { | 2768 | if ((master->priv_flags & IFF_MASTER_ALB) && |
2769 | (master->priv_flags & IFF_BRIDGE_PORT)) { | ||
2769 | /* Do address unmangle. The local destination address | 2770 | /* Do address unmangle. The local destination address |
2770 | * will be always the one master has. Provides the right | 2771 | * will be always the one master has. Provides the right |
2771 | * functionality in a bridge. | 2772 | * functionality in a bridge. |