← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/net/wireless/hostap/hostap_main.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/wireless/hostap/hostap_main.c
79
79
        if (!rtnl_locked)
80
80
                rtnl_lock();
81
81
 
82
 
        ret = 0;
83
 
        if (strchr(dev->name, '%'))
84
 
                ret = dev_alloc_name(dev, dev->name);
85
 
 
86
82
        SET_NETDEV_DEV(dev, mdev->dev.parent);
87
 
        if (ret >= 0)
88
 
                ret = register_netdevice(dev);
 
83
        ret = register_netdevice(dev);
89
84
 
90
85
        if (!rtnl_locked)
91
86
                rtnl_unlock();