[PATCH] bonding: Remove unneeded NULL test
authorJay Vosburgh <fubar@us.ibm.com>
Sat, 23 Sep 2006 04:53:25 +0000 (21:53 -0700)
committerJeff Garzik <jeff@garzik.org>
Tue, 26 Sep 2006 00:08:09 +0000 (20:08 -0400)
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>
drivers/net/bonding/bond_sysfs.c

index cfe4dc3a93a3b8c1264ee03dd4516f3aa44dfbd4..15b6a29bb4d4af3c4098dd611eb3c80a9aa4d7ac 100644 (file)
@@ -1093,7 +1093,7 @@ static ssize_t bonding_store_active_slave(struct class_device *cd, const char *b
                             strlen(slave->dev->name)) == 0) {
                                old_active = bond->curr_active_slave;
                                new_active = slave;
-                               if (new_active && (new_active == old_active)) {
+                               if (new_active == old_active) {
                                        /* do nothing */
                                        printk(KERN_INFO DRV_NAME
                                               ": %s: %s is already the current active slave.\n",