aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding
diff options
context:
space:
mode:
authorJay Vosburgh <fubar@us.ibm.com>2006-09-23 00:53:25 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-25 20:08:09 -0400
commita50d8de2cc872818b61e60c20c75be3f19aa6887 (patch)
tree9ea764b51534cc2a85111515d8dd95da419c0ea4 /drivers/net/bonding
parent65509645ae05886eccc81b8a453afea07f0eabb6 (diff)
[PATCH] bonding: Remove unneeded NULL test
Remove unneeded test for NULL. Reported by Thomas Dillig <tdillig@stanford.edu> and Isil Dillig <isil@stanford.edu> via Stephen Hemminger <shemminger@osdl.org>. Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r--drivers/net/bonding/bond_sysfs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index cfe4dc3a93a3..15b6a29bb4d4 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -1093,7 +1093,7 @@ static ssize_t bonding_store_active_slave(struct class_device *cd, const char *b
1093 strlen(slave->dev->name)) == 0) { 1093 strlen(slave->dev->name)) == 0) {
1094 old_active = bond->curr_active_slave; 1094 old_active = bond->curr_active_slave;
1095 new_active = slave; 1095 new_active = slave;
1096 if (new_active && (new_active == old_active)) { 1096 if (new_active == old_active) {
1097 /* do nothing */ 1097 /* do nothing */
1098 printk(KERN_INFO DRV_NAME 1098 printk(KERN_INFO DRV_NAME
1099 ": %s: %s is already the current active slave.\n", 1099 ": %s: %s is already the current active slave.\n",