X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fbridge%2Fbr_device.c;fp=net%2Fbridge%2Fbr_device.c;h=0b33a7b3a00cd5c05b0b8e16ec91f0aec4a58599;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=f8dbcee80ebad7cdffb110fd87a8796db93643ab;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index f8dbcee80..0b33a7b3a 100644
--- 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;
 }
 
-/* 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);
@@ -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);
 
+	rcu_read_lock();
 	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);
 
+	rcu_read_unlock();
 	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)
-		br->feature_mask |= NETIF_F_NO_CSUM;
+		br->feature_mask |= NETIF_F_IP_CSUM;
 	else
-		br->feature_mask &= ~NETIF_F_ALL_CSUM;
+		br->feature_mask &= ~NETIF_F_IP_CSUM;
 
 	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->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;
 }