diff options
Diffstat (limited to 'net/bridge/br_device.c')
-rw-r--r-- | net/bridge/br_device.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index 0b33a7b3a00c..0c88a2ac32c1 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c | |||
@@ -27,6 +27,7 @@ static struct net_device_stats *br_dev_get_stats(struct net_device *dev) | |||
27 | return &br->statistics; | 27 | return &br->statistics; |
28 | } | 28 | } |
29 | 29 | ||
30 | /* net device transmit always called with no BH (preempt_disabled) */ | ||
30 | int br_dev_xmit(struct sk_buff *skb, struct net_device *dev) | 31 | int br_dev_xmit(struct sk_buff *skb, struct net_device *dev) |
31 | { | 32 | { |
32 | struct net_bridge *br = netdev_priv(dev); | 33 | struct net_bridge *br = netdev_priv(dev); |
@@ -39,7 +40,6 @@ int br_dev_xmit(struct sk_buff *skb, struct net_device *dev) | |||
39 | skb->mac.raw = skb->data; | 40 | skb->mac.raw = skb->data; |
40 | skb_pull(skb, ETH_HLEN); | 41 | skb_pull(skb, ETH_HLEN); |
41 | 42 | ||
42 | rcu_read_lock(); | ||
43 | if (dest[0] & 1) | 43 | if (dest[0] & 1) |
44 | br_flood_deliver(br, skb, 0); | 44 | br_flood_deliver(br, skb, 0); |
45 | else if ((dst = __br_fdb_get(br, dest)) != NULL) | 45 | else if ((dst = __br_fdb_get(br, dest)) != NULL) |
@@ -47,7 +47,6 @@ int br_dev_xmit(struct sk_buff *skb, struct net_device *dev) | |||
47 | else | 47 | else |
48 | br_flood_deliver(br, skb, 0); | 48 | br_flood_deliver(br, skb, 0); |
49 | 49 | ||
50 | rcu_read_unlock(); | ||
51 | return 0; | 50 | return 0; |
52 | } | 51 | } |
53 | 52 | ||