1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 55d236726d11..8171cae06688 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1199,8 +1199,7 @@ int bond_sethwaddr(struct net_device *bond_dev, struct net_device *slave_dev)
 }
 
 #define BOND_INTERSECT_FEATURES \
-        (NETIF_F_SG|NETIF_F_IP_CSUM|NETIF_F_NO_CSUM|NETIF_F_HW_CSUM|\
-        NETIF_F_TSO|NETIF_F_UFO)
+        (NETIF_F_SG | NETIF_F_ALL_CSUM | NETIF_F_TSO | NETIF_F_UFO)
 
 /* 
  * Compute the common dev->feature set available to all slaves.  Some
@@ -1218,9 +1217,7 @@ static int bond_compute_features(struct bonding *bond)
                 features &= (slave->dev->features & BOND_INTERSECT_FEATURES);
 
         if ((features & NETIF_F_SG) && 
-            !(features & (NETIF_F_IP_CSUM |
-                          NETIF_F_NO_CSUM |
-                          NETIF_F_HW_CSUM)))
+            !(features & NETIF_F_ALL_CSUM))
                 features &= ~NETIF_F_SG;
 
         /* 
@@ -4191,7 +4188,7 @@ static int bond_init(struct net_device *bond_dev, struct bond_params *params)
          */
         bond_dev->features |= NETIF_F_VLAN_CHALLENGED;
 
-        /* don't acquire bond device's xmit_lock when 
+        /* don't acquire bond device's netif_tx_lock when
          * transmitting */
         bond_dev->features |= NETIF_F_LLTX;