lkml.org 
[lkml]   [2012]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 07/37] wanmain: comparing array with NULL
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------
    From: Alan Cox <alan@linux.intel.com>

    [ Upstream commit 8b72ff6484fe303e01498b58621810a114f3cf09 ]

    gcc really should warn about these !

    Signed-off-by: Alan Cox <alan@linux.intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    net/wanrouter/wanmain.c | 51 ++++++++++++++++++++++---------------------------
    1 file changed, 23 insertions(+), 28 deletions(-)
    diff --git a/net/wanrouter/wanmain.c b/net/wanrouter/wanmain.c
    index 788a12c..2ab7850 100644
    --- a/net/wanrouter/wanmain.c
    +++ b/net/wanrouter/wanmain.c
    @@ -602,36 +602,31 @@ static int wanrouter_device_new_if(struct wan_device *wandev,
    * successfully, add it to the interface list.
    */

    - if (dev->name == NULL) {
    - err = -EINVAL;
    - } else {
    +#ifdef WANDEBUG
    + printk(KERN_INFO "%s: registering interface %s...\n",
    + wanrouter_modname, dev->name);
    +#endif

    - #ifdef WANDEBUG
    - printk(KERN_INFO "%s: registering interface %s...\n",
    - wanrouter_modname, dev->name);
    - #endif
    -
    - err = register_netdev(dev);
    - 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;
    - } else {
    - for (slave=wandev->dev;
    - DEV_TO_SLAVE(slave);
    - slave = DEV_TO_SLAVE(slave))
    - DEV_TO_SLAVE(slave) = dev;
    - }
    - ++wandev->ndev;
    -
    - unlock_adapter_irq(&wandev->lock, &smp_flags);
    - err = 0; /* done !!! */
    - goto out;
    + err = register_netdev(dev);
    + 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;
    + } else {
    + for (slave=wandev->dev;
    + DEV_TO_SLAVE(slave);
    + slave = DEV_TO_SLAVE(slave))
    + DEV_TO_SLAVE(slave) = dev;
    }
    + ++wandev->ndev;
    +
    + unlock_adapter_irq(&wandev->lock, &smp_flags);
    + err = 0; /* done !!! */
    + goto out;
    }
    if (wandev->del_if)
    wandev->del_if(wandev, dev);



    \
     
     \ /
      Last update: 2012-08-17 07:01    [W:0.160 / U:0.584 seconds]
    ©2003-2014 Jasper Spaans. Advertise on this site