diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/bonding/bond_sysfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c index 32d13da43a0b..041bcc583557 100644 --- a/drivers/net/bonding/bond_sysfs.c +++ b/drivers/net/bonding/bond_sysfs.c | |||
@@ -260,7 +260,7 @@ static ssize_t bonding_store_slaves(struct class_device *cd, const char *buffer, | |||
260 | char *ifname; | 260 | char *ifname; |
261 | int i, res, found, ret = count; | 261 | int i, res, found, ret = count; |
262 | struct slave *slave; | 262 | struct slave *slave; |
263 | struct net_device *dev = 0; | 263 | struct net_device *dev = NULL; |
264 | struct bonding *bond = to_bond(cd); | 264 | struct bonding *bond = to_bond(cd); |
265 | 265 | ||
266 | /* Quick sanity check -- is the bond interface up? */ | 266 | /* Quick sanity check -- is the bond interface up? */ |
@@ -995,7 +995,7 @@ static ssize_t bonding_store_primary(struct class_device *cd, const char *buf, s | |||
995 | printk(KERN_INFO DRV_NAME | 995 | printk(KERN_INFO DRV_NAME |
996 | ": %s: Setting primary slave to None.\n", | 996 | ": %s: Setting primary slave to None.\n", |
997 | bond->dev->name); | 997 | bond->dev->name); |
998 | bond->primary_slave = 0; | 998 | bond->primary_slave = NULL; |
999 | bond_select_active_slave(bond); | 999 | bond_select_active_slave(bond); |
1000 | } else { | 1000 | } else { |
1001 | printk(KERN_INFO DRV_NAME | 1001 | printk(KERN_INFO DRV_NAME |
@@ -1123,7 +1123,7 @@ static ssize_t bonding_store_active_slave(struct class_device *cd, const char *b | |||
1123 | printk(KERN_INFO DRV_NAME | 1123 | printk(KERN_INFO DRV_NAME |
1124 | ": %s: Setting active slave to None.\n", | 1124 | ": %s: Setting active slave to None.\n", |
1125 | bond->dev->name); | 1125 | bond->dev->name); |
1126 | bond->primary_slave = 0; | 1126 | bond->primary_slave = NULL; |
1127 | bond_select_active_slave(bond); | 1127 | bond_select_active_slave(bond); |
1128 | } else { | 1128 | } else { |
1129 | printk(KERN_INFO DRV_NAME | 1129 | printk(KERN_INFO DRV_NAME |