git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
net
/
bridge
/
br_device.c
diff --git
a/net/bridge/br_device.c
b/net/bridge/br_device.c
index
f8dbcee
..
0b33a7b
100644
(file)
--- a/
net/bridge/br_device.c
+++ b/
net/bridge/br_device.c
@@
-27,7
+27,6
@@
static struct net_device_stats *br_dev_get_stats(struct net_device *dev)
return &br->statistics;
}
return &br->statistics;
}
-/* net device transmit always called with no BH (preempt_disabled) */
int br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct net_bridge *br = netdev_priv(dev);
int br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct net_bridge *br = netdev_priv(dev);
@@
-40,6
+39,7
@@
int br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
skb->mac.raw = skb->data;
skb_pull(skb, ETH_HLEN);
skb->mac.raw = skb->data;
skb_pull(skb, ETH_HLEN);
+ rcu_read_lock();
if (dest[0] & 1)
br_flood_deliver(br, skb, 0);
else if ((dst = __br_fdb_get(br, dest)) != NULL)
if (dest[0] & 1)
br_flood_deliver(br, skb, 0);
else if ((dst = __br_fdb_get(br, dest)) != NULL)
@@
-47,6
+47,7
@@
int br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
else
br_flood_deliver(br, skb, 0);
else
br_flood_deliver(br, skb, 0);
+ rcu_read_unlock();
return 0;
}
return 0;
}
@@
-145,9
+146,9
@@
static int br_set_tx_csum(struct net_device *dev, u32 data)
struct net_bridge *br = netdev_priv(dev);
if (data)
struct net_bridge *br = netdev_priv(dev);
if (data)
- br->feature_mask |= NETIF_F_
NO
_CSUM;
+ br->feature_mask |= NETIF_F_
IP
_CSUM;
else
else
- br->feature_mask &= ~NETIF_F_
ALL
_CSUM;
+ br->feature_mask &= ~NETIF_F_
IP
_CSUM;
br_features_recompute(br);
return 0;
br_features_recompute(br);
return 0;
@@
-184,6
+185,6
@@
void br_dev_setup(struct net_device *dev)
dev->set_mac_address = br_set_mac_address;
dev->priv_flags = IFF_EBRIDGE;
dev->set_mac_address = br_set_mac_address;
dev->priv_flags = IFF_EBRIDGE;
- dev->features = NETIF_F_SG | NETIF_F_FRAGLIST
| NETIF_F_HIGHDMA |
-
NETIF_F_TSO | NETIF_F_NO_CSUM | NETIF_F_GSO_ROBUST
;
+ dev->features = NETIF_F_SG | NETIF_F_FRAGLIST
+
| NETIF_F_HIGHDMA | NETIF_F_TSO | NETIF_F_IP_CSUM
;
}
}