Commit 6d8c96cb authored by David Binder's avatar David Binder Committed by Greg Kroah-Hartman

staging: unisys: visornic: simplify visornic if statements

Changes the conditional logic by looking for the absence of work
to do, instead of the opposite.
Signed-off-by: default avatarDavid Binder <david.binder@unisys.com>
Reviewed-by: default avatarTim Sell <Timothy.Sell@unisys.com>
Signed-off-by: default avatarDavid Kershner <david.kershner@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d91184a9
...@@ -1000,10 +1000,13 @@ visornic_set_multi(struct net_device *netdev) ...@@ -1000,10 +1000,13 @@ visornic_set_multi(struct net_device *netdev)
struct uiscmdrsp *cmdrsp; struct uiscmdrsp *cmdrsp;
struct visornic_devdata *devdata = netdev_priv(netdev); struct visornic_devdata *devdata = netdev_priv(netdev);
/* any filtering changes */ if (devdata->old_flags == netdev->flags)
if (devdata->old_flags != netdev->flags) { return;
if ((netdev->flags & IFF_PROMISC) !=
(devdata->old_flags & IFF_PROMISC)) { if ((netdev->flags & IFF_PROMISC) ==
(devdata->old_flags & IFF_PROMISC))
goto out_save_flags;
cmdrsp = kmalloc(SIZEOF_CMDRSP, GFP_ATOMIC); cmdrsp = kmalloc(SIZEOF_CMDRSP, GFP_ATOMIC);
if (!cmdrsp) if (!cmdrsp)
return; return;
...@@ -1016,9 +1019,9 @@ visornic_set_multi(struct net_device *netdev) ...@@ -1016,9 +1019,9 @@ visornic_set_multi(struct net_device *netdev)
IOCHAN_TO_IOPART, IOCHAN_TO_IOPART,
cmdrsp); cmdrsp);
kfree(cmdrsp); kfree(cmdrsp);
}
out_save_flags:
devdata->old_flags = netdev->flags; devdata->old_flags = netdev->flags;
}
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment