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 /drivers/net/ksz884x.c | |
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 'drivers/net/ksz884x.c')
-rw-r--r-- | drivers/net/ksz884x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ksz884x.c b/drivers/net/ksz884x.c index 7805bbf1d53a..62362b4a8c56 100644 --- a/drivers/net/ksz884x.c +++ b/drivers/net/ksz884x.c | |||
@@ -5718,7 +5718,7 @@ static void dev_set_promiscuous(struct net_device *dev, struct dev_priv *priv, | |||
5718 | * from the bridge. | 5718 | * from the bridge. |
5719 | */ | 5719 | */ |
5720 | if ((hw->features & STP_SUPPORT) && !promiscuous && | 5720 | if ((hw->features & STP_SUPPORT) && !promiscuous && |
5721 | dev->br_port) { | 5721 | (dev->priv_flags & IFF_BRIDGE_PORT)) { |
5722 | struct ksz_switch *sw = hw->ksz_switch; | 5722 | struct ksz_switch *sw = hw->ksz_switch; |
5723 | int port = priv->port.first_port; | 5723 | int port = priv->port.first_port; |
5724 | 5724 | ||