2 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 163e0b06eaa5..1df9f0ea9184 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1372,8 +1372,8 @@ static int bond_compute_features(struct bonding *bond)
 {
         struct slave *slave;
         struct net_device *bond_dev = bond->dev;
-        unsigned long features = bond_dev->features;
-        unsigned long vlan_features = 0;
+        u32 features = bond_dev->features;
+        u32 vlan_features = 0;
         unsigned short max_hard_header_len = max((u16)ETH_HLEN,
                                                 bond_dev->hard_header_len);
         int i;
@@ -1400,8 +1400,8 @@ static int bond_compute_features(struct bonding *bond)
 
 done:
         features |= (bond_dev->features & BOND_VLAN_FEATURES);
-        bond_dev->features = netdev_fix_features(features, NULL);
-        bond_dev->vlan_features = netdev_fix_features(vlan_features, NULL);
+        bond_dev->features = netdev_fix_features(bond_dev, features);
+        bond_dev->vlan_features = netdev_fix_features(bond_dev, vlan_features);
         bond_dev->hard_header_len = max_hard_header_len;
 
         return 0;
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 8fd0174c5380..72bb0f6cc9bf 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -1198,7 +1198,7 @@ static ssize_t bonding_store_carrier(struct device *d,
                         bond->dev->name, new_value);
         }
 out:
-        return count;
+        return ret;
 }
 static DEVICE_ATTR(use_carrier, S_IRUGO | S_IWUSR,
                    bonding_show_carrier, bonding_store_carrier);
@@ -1595,7 +1595,7 @@ static ssize_t bonding_store_slaves_active(struct device *d,
                 }
         }
 out:
-        return count;
+        return ret;
 }
 static DEVICE_ATTR(all_slaves_active, S_IRUGO | S_IWUSR,
                    bonding_show_slaves_active, bonding_store_slaves_active);