wanmain: comparing array with NULL
gcc really should warn about these ! Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
c66b9b7d36
commit
8b72ff6484
@ -602,36 +602,31 @@ static int wanrouter_device_new_if(struct wan_device *wandev,
|
|||||||
* successfully, add it to the interface list.
|
* successfully, add it to the interface list.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (dev->name == NULL) {
|
#ifdef WANDEBUG
|
||||||
err = -EINVAL;
|
printk(KERN_INFO "%s: registering interface %s...\n",
|
||||||
} else {
|
wanrouter_modname, dev->name);
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef WANDEBUG
|
err = register_netdev(dev);
|
||||||
printk(KERN_INFO "%s: registering interface %s...\n",
|
if (!err) {
|
||||||
wanrouter_modname, dev->name);
|
struct net_device *slave = NULL;
|
||||||
#endif
|
unsigned long smp_flags=0;
|
||||||
|
|
||||||
err = register_netdev(dev);
|
lock_adapter_irq(&wandev->lock, &smp_flags);
|
||||||
if (!err) {
|
|
||||||
struct net_device *slave = NULL;
|
|
||||||
unsigned long smp_flags=0;
|
|
||||||
|
|
||||||
lock_adapter_irq(&wandev->lock, &smp_flags);
|
if (wandev->dev == NULL) {
|
||||||
|
wandev->dev = dev;
|
||||||
if (wandev->dev == NULL) {
|
} else {
|
||||||
wandev->dev = dev;
|
for (slave=wandev->dev;
|
||||||
} else {
|
DEV_TO_SLAVE(slave);
|
||||||
for (slave=wandev->dev;
|
slave = DEV_TO_SLAVE(slave))
|
||||||
DEV_TO_SLAVE(slave);
|
DEV_TO_SLAVE(slave) = dev;
|
||||||
slave = DEV_TO_SLAVE(slave))
|
|
||||||
DEV_TO_SLAVE(slave) = dev;
|
|
||||||
}
|
|
||||||
++wandev->ndev;
|
|
||||||
|
|
||||||
unlock_adapter_irq(&wandev->lock, &smp_flags);
|
|
||||||
err = 0; /* done !!! */
|
|
||||||
goto out;
|
|
||||||
}
|
}
|
||||||
|
++wandev->ndev;
|
||||||
|
|
||||||
|
unlock_adapter_irq(&wandev->lock, &smp_flags);
|
||||||
|
err = 0; /* done !!! */
|
||||||
|
goto out;
|
||||||
}
|
}
|
||||||
if (wandev->del_if)
|
if (wandev->del_if)
|
||||||
wandev->del_if(wandev, dev);
|
wandev->del_if(wandev, dev);
|
||||||
|
Loading…
Reference in New Issue
Block a user