cfg80211: fix netdev down problem

[pandora-kernel.git] / net / wireless / core.c

diff --git a/net/wireless/core.c b/net/wireless/core.c
index d585029..83ec719 100644 (file)
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -321,6 +321,7 @@ struct wiphy *wiphy_new(const struct cfg80211_ops *ops, int sizeof_priv)
        }
 
        INIT_WORK(&drv->rfkill_sync, cfg80211_rfkill_sync_work);
+       INIT_WORK(&drv->conn_work, cfg80211_conn_work);
 
        /*
         * Initialize wiphy parameters to IEEE 802.11 MIB default values.
@@ -346,9 +347,6 @@ int wiphy_register(struct wiphy *wiphy)
        int i;
        u16 ifmodes = wiphy->interface_modes;
 
-       if (WARN_ON(wiphy->max_scan_ssids < 1))
-               return -EINVAL;
-
        /* sanity check ifmodes */
        WARN_ON(!ifmodes);
        ifmodes &= ((1 << __NL80211_IFTYPE_AFTER_LAST) - 1) & ~1;
@@ -484,6 +482,8 @@ void wiphy_unregister(struct wiphy *wiphy)
        /* unlock again before freeing */
        mutex_unlock(&drv->mtx);
 
+       cancel_work_sync(&drv->conn_work);
+
        cfg80211_debugfs_drv_del(drv);
 
        /* If this device got a regulatory hint tell core its
@@ -529,52 +529,86 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb,
                                         void *ndev)
 {
        struct net_device *dev = ndev;
+       struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct cfg80211_registered_device *rdev;
 
-       if (!dev->ieee80211_ptr)
+       if (!wdev)
                return NOTIFY_DONE;
 
-       rdev = wiphy_to_dev(dev->ieee80211_ptr->wiphy);
+       rdev = wiphy_to_dev(wdev->wiphy);
 
-       WARN_ON(dev->ieee80211_ptr->iftype == NL80211_IFTYPE_UNSPECIFIED);
+       WARN_ON(wdev->iftype == NL80211_IFTYPE_UNSPECIFIED);
 
        switch (state) {
        case NETDEV_REGISTER:
                mutex_lock(&rdev->devlist_mtx);
-               list_add(&dev->ieee80211_ptr->list, &rdev->netdev_list);
+               list_add(&wdev->list, &rdev->netdev_list);
                if (sysfs_create_link(&dev->dev.kobj, &rdev->wiphy.dev.kobj,
                                      "phy80211")) {
                        printk(KERN_ERR "wireless: failed to add phy80211 "
                                "symlink to netdev!\n");
                }
-               dev->ieee80211_ptr->netdev = dev;
+               wdev->netdev = dev;
+               wdev->sme_state = CFG80211_SME_IDLE;
+               mutex_unlock(&rdev->devlist_mtx);
 #ifdef CONFIG_WIRELESS_EXT
-               dev->ieee80211_ptr->wext.default_key = -1;
-               dev->ieee80211_ptr->wext.default_mgmt_key = -1;
+               wdev->wext.default_key = -1;
+               wdev->wext.default_mgmt_key = -1;
+               wdev->wext.connect.auth_type = NL80211_AUTHTYPE_AUTOMATIC;
+               wdev->wext.ps = CONFIG_CFG80211_DEFAULT_PS_VALUE;
+               wdev->wext.ps_timeout = 500;
+               if (rdev->ops->set_power_mgmt)
+                       if (rdev->ops->set_power_mgmt(wdev->wiphy, dev,
+                                                     wdev->wext.ps,
+                                                     wdev->wext.ps_timeout)) {
+                               /* assume this means it's off */
+                               wdev->wext.ps = false;
+                       }
 #endif
-               mutex_unlock(&rdev->devlist_mtx);
                break;
        case NETDEV_GOING_DOWN:
-               if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_ADHOC)
+               switch (wdev->iftype) {
+               case NL80211_IFTYPE_ADHOC:
+                       cfg80211_leave_ibss(rdev, dev, true);
                        break;
-               if (!dev->ieee80211_ptr->ssid_len)
+               case NL80211_IFTYPE_STATION:
+#ifdef CONFIG_WIRELESS_EXT
+                       kfree(wdev->wext.ie);
+                       wdev->wext.ie = NULL;
+                       wdev->wext.ie_len = 0;
+                       wdev->wext.connect.auth_type = NL80211_AUTHTYPE_AUTOMATIC;
+#endif
+                       cfg80211_disconnect(rdev, dev,
+                                           WLAN_REASON_DEAUTH_LEAVING, true);
+                       cfg80211_mlme_down(rdev, dev);
                        break;
-               cfg80211_leave_ibss(rdev, dev, true);
+               default:
+                       break;
+               }
                break;
        case NETDEV_UP:
 #ifdef CONFIG_WIRELESS_EXT
-               if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_ADHOC)
+               switch (wdev->iftype) {
+               case NL80211_IFTYPE_ADHOC:
+                       if (wdev->wext.ibss.ssid_len)
+                               cfg80211_join_ibss(rdev, dev,
+                                                  &wdev->wext.ibss);
                        break;
-               if (!dev->ieee80211_ptr->wext.ibss.ssid_len)
+               case NL80211_IFTYPE_STATION:
+                       if (wdev->wext.connect.ssid_len)
+                               cfg80211_connect(rdev, dev,
+                                                &wdev->wext.connect);
                        break;
-               cfg80211_join_ibss(rdev, dev, &dev->ieee80211_ptr->wext.ibss);
-               break;
+               default:
+                       break;
+               }
 #endif
+               break;
        case NETDEV_UNREGISTER:
                mutex_lock(&rdev->devlist_mtx);
-               if (!list_empty(&dev->ieee80211_ptr->list)) {
+               if (!list_empty(&wdev->list)) {
                        sysfs_remove_link(&dev->dev.kobj, "phy80211");
-                       list_del_init(&dev->ieee80211_ptr->list);
+                       list_del_init(&wdev->list);
                }
                mutex_unlock(&rdev->devlist_mtx);
                break;