Merge branch 'linus' into percpu-cpumask-x86-for-linus-2

Conflicts:
	arch/sparc/kernel/time_64.c
	drivers/gpu/drm/drm_proc.c

Manual merge to resolve build warning due to phys_addr_t type change
on x86:

	drivers/gpu/drm/drm_info.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

10 files changed, 815 insertions, 284 deletions

diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index 092ae6faccca..3c3bc9e579ed 100644
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -10,51 +10,19 @@ config CFG80211_REG_DEBUG
 
           If unsure, say N.
 
-config NL80211
-        bool "nl80211 new netlink interface support"
-        depends on CFG80211
-        default y
-        ---help---
-          This option turns on the new netlink interface
-          (nl80211) support in cfg80211.
-
-          If =n, drivers using mac80211 will be configured via
-          wireless extension support provided by that subsystem.
-
-          If unsure, say Y.
-
 config WIRELESS_OLD_REGULATORY
         bool "Old wireless static regulatory definitions"
-        default y
+        default n
         ---help---
           This option enables the old static regulatory information
-          and uses it within the new framework. This is available
-          temporarily as an option to help prevent immediate issues
-          due to the switch to the new regulatory framework which
-          does require a new userspace application which has the
-          database of regulatory information (CRDA) and another for
-          setting regulatory domains (iw).
-
-          For more information see:
-
-          http://wireless.kernel.org/en/developers/Regulatory/CRDA
-          http://wireless.kernel.org/en/users/Documentation/iw
-
-          It is important to note though that if you *do* have CRDA present
-          and if this option is enabled CRDA *will* be called to update the
-          regulatory domain (for US and JP only). Support for letting the user
-          set the regulatory domain through iw is also supported. This option
-          mainly exists to leave around for a kernel release some old static
-          regulatory domains that were defined and to keep around the old
-          ieee80211_regdom module parameter. This is being phased out and you
-          should stop using them ASAP.
-
-          Note: You will need CRDA if you want 802.11d support
-
-          Say Y unless you have installed a new userspace application.
-          Also say Y if have one currently depending on the ieee80211_regdom
-          module parameter and cannot port it to use the new userspace
-          interfaces.
+          and uses it within the new framework. This option is available
+          for historical reasons and it is advised to leave it off.
+
+          For details see:
+
+          http://wireless.kernel.org/en/developers/Regulatory
+
+          Say N and if you say Y, please tell us why. The default is N.
 
 config WIRELESS_EXT
         bool "Wireless extensions"
diff --git a/net/wireless/Makefile b/net/wireless/Makefile
index dad43c24f695..6d1e7b27b752 100644
--- a/net/wireless/Makefile
+++ b/net/wireless/Makefile
@@ -5,8 +5,7 @@ obj-$(CONFIG_LIB80211_CRYPT_WEP) += lib80211_crypt_wep.o
 obj-$(CONFIG_LIB80211_CRYPT_CCMP) += lib80211_crypt_ccmp.o
 obj-$(CONFIG_LIB80211_CRYPT_TKIP) += lib80211_crypt_tkip.o
 
-cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o
+cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o mlme.o
 cfg80211-$(CONFIG_WIRELESS_EXT) += wext-compat.o
-cfg80211-$(CONFIG_NL80211) += nl80211.o
 
 ccflags-y += -D__CHECK_ENDIAN__
diff --git a/net/wireless/core.c b/net/wireless/core.c
index 17fe39049740..d1f556535f6d 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -87,7 +87,7 @@ struct wiphy *wiphy_idx_to_wiphy(int wiphy_idx)
 }
 
 /* requires cfg80211_mutex to be held! */
-static struct cfg80211_registered_device *
+struct cfg80211_registered_device *
 __cfg80211_drv_from_info(struct genl_info *info)
 {
         int ifindex;
@@ -176,13 +176,14 @@ void cfg80211_put_dev(struct cfg80211_registered_device *drv)
         mutex_unlock(&drv->mtx);
 }
 
+/* requires cfg80211_mutex to be held */
 int cfg80211_dev_rename(struct cfg80211_registered_device *rdev,
                         char *newname)
 {
         struct cfg80211_registered_device *drv;
         int wiphy_idx, taken = -1, result, digits;
 
-        mutex_lock(&cfg80211_mutex);
+        assert_cfg80211_lock();
 
         /* prohibit calling the thing phy%d when %d is not its number */
         sscanf(newname, PHY_NAME "%d%n", &wiphy_idx, &taken);
@@ -195,30 +196,23 @@ int cfg80211_dev_rename(struct cfg80211_registered_device *rdev,
                  * deny the name if it is phy<idx> where <idx> is printed
                  * without leading zeroes. taken == strlen(newname) here
                  */
-                result = -EINVAL;
                 if (taken == strlen(PHY_NAME) + digits)
-                        goto out_unlock;
+                        return -EINVAL;
         }
 
 
         /* Ignore nop renames */
-        result = 0;
         if (strcmp(newname, dev_name(&rdev->wiphy.dev)) == 0)
-                goto out_unlock;
+                return 0;
 
         /* Ensure another device does not already have this name. */
-        list_for_each_entry(drv, &cfg80211_drv_list, list) {
-                result = -EINVAL;
+        list_for_each_entry(drv, &cfg80211_drv_list, list)
                 if (strcmp(newname, dev_name(&drv->wiphy.dev)) == 0)
-                        goto out_unlock;
-        }
+                        return -EINVAL;
 
-        /* this will only check for collisions in sysfs
-         * which is not even always compiled in.
-         */
         result = device_rename(&rdev->wiphy.dev, newname);
         if (result)
-                goto out_unlock;
+                return result;
 
         if (rdev->wiphy.debugfsdir &&
             !debugfs_rename(rdev->wiphy.debugfsdir->d_parent,
@@ -228,13 +222,9 @@ int cfg80211_dev_rename(struct cfg80211_registered_device *rdev,
                 printk(KERN_ERR "cfg80211: failed to rename debugfs dir to %s!\n",
                        newname);
 
-        result = 0;
-out_unlock:
-        mutex_unlock(&cfg80211_mutex);
-        if (result == 0)
-                nl80211_notify_dev_rename(rdev);
+        nl80211_notify_dev_rename(rdev);
 
-        return result;
+        return 0;
 }
 
 /* exported functions */
diff --git a/net/wireless/core.h b/net/wireless/core.h
index 6acd483a61f8..d43daa236ef9 100644
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -90,6 +90,8 @@ struct cfg80211_internal_bss {
         struct rb_node rbn;
         unsigned long ts;
         struct kref ref;
+        bool hold;
+
         /* must be last because of priv member */
         struct cfg80211_bss pub;
 };
@@ -97,6 +99,9 @@ struct cfg80211_internal_bss {
 struct cfg80211_registered_device *cfg80211_drv_by_wiphy_idx(int wiphy_idx);
 int get_wiphy_idx(struct wiphy *wiphy);
 
+struct cfg80211_registered_device *
+__cfg80211_drv_from_info(struct genl_info *info);
+
 /*
  * This function returns a pointer to the driver
  * that the genl_info item that is passed refers to.
diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c
new file mode 100644
index 000000000000..bec5721b6f99
--- /dev/null
+++ b/net/wireless/mlme.c
@@ -0,0 +1,46 @@
+/*
+ * cfg80211 MLME SAP interface
+ *
+ * Copyright (c) 2009, Jouni Malinen <j@w1.fi>
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/netdevice.h>
+#include <linux/nl80211.h>
+#include <net/cfg80211.h>
+#include "core.h"
+#include "nl80211.h"
+
+void cfg80211_send_rx_auth(struct net_device *dev, const u8 *buf, size_t len)
+{
+        struct wiphy *wiphy = dev->ieee80211_ptr->wiphy;
+        struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
+        nl80211_send_rx_auth(rdev, dev, buf, len);
+}
+EXPORT_SYMBOL(cfg80211_send_rx_auth);
+
+void cfg80211_send_rx_assoc(struct net_device *dev, const u8 *buf, size_t len)
+{
+        struct wiphy *wiphy = dev->ieee80211_ptr->wiphy;
+        struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
+        nl80211_send_rx_assoc(rdev, dev, buf, len);
+}
+EXPORT_SYMBOL(cfg80211_send_rx_assoc);
+
+void cfg80211_send_rx_deauth(struct net_device *dev, const u8 *buf, size_t len)
+{
+        struct wiphy *wiphy = dev->ieee80211_ptr->wiphy;
+        struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
+        nl80211_send_rx_deauth(rdev, dev, buf, len);
+}
+EXPORT_SYMBOL(cfg80211_send_rx_deauth);
+
+void cfg80211_send_rx_disassoc(struct net_device *dev, const u8 *buf,
+                               size_t len)
+{
+        struct wiphy *wiphy = dev->ieee80211_ptr->wiphy;
+        struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
+        nl80211_send_rx_disassoc(rdev, dev, buf, len);
+}
+EXPORT_SYMBOL(cfg80211_send_rx_disassoc);
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index ab9d8f14e151..353e1a4ece83 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -111,6 +111,11 @@ static struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] __read_mostly = {
                               .len = IEEE80211_MAX_DATA_LEN },
         [NL80211_ATTR_SCAN_FREQUENCIES] = { .type = NLA_NESTED },
         [NL80211_ATTR_SCAN_SSIDS] = { .type = NLA_NESTED },
+
+        [NL80211_ATTR_SSID] = { .type = NLA_BINARY,
+                                .len = IEEE80211_MAX_SSID_LEN },
+        [NL80211_ATTR_AUTH_TYPE] = { .type = NLA_U32 },
+        [NL80211_ATTR_REASON_CODE] = { .type = NLA_U16 },
 };
 
 /* message building helper */
@@ -131,6 +136,7 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,
         struct nlattr *nl_freqs, *nl_freq;
         struct nlattr *nl_rates, *nl_rate;
         struct nlattr *nl_modes;
+        struct nlattr *nl_cmds;
         enum ieee80211_band band;
         struct ieee80211_channel *chan;
         struct ieee80211_rate *rate;
@@ -242,6 +248,35 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,
         }
         nla_nest_end(msg, nl_bands);
 
+        nl_cmds = nla_nest_start(msg, NL80211_ATTR_SUPPORTED_COMMANDS);
+        if (!nl_cmds)
+                goto nla_put_failure;
+
+        i = 0;
+#define CMD(op, n)                                              \
+         do {                                                   \
+                if (dev->ops->op) {                             \
+                        i++;                                    \
+                        NLA_PUT_U32(msg, i, NL80211_CMD_ ## n); \
+                }                                               \
+        } while (0)
+
+        CMD(add_virtual_intf, NEW_INTERFACE);
+        CMD(change_virtual_intf, SET_INTERFACE);
+        CMD(add_key, NEW_KEY);
+        CMD(add_beacon, NEW_BEACON);
+        CMD(add_station, NEW_STATION);
+        CMD(add_mpath, NEW_MPATH);
+        CMD(set_mesh_params, SET_MESH_PARAMS);
+        CMD(change_bss, SET_BSS);
+        CMD(auth, AUTHENTICATE);
+        CMD(assoc, ASSOCIATE);
+        CMD(deauth, DEAUTHENTICATE);
+        CMD(disassoc, DISASSOCIATE);
+
+#undef CMD
+        nla_nest_end(msg, nl_cmds);
+
         return genlmsg_end(msg, hdr);
 
  nla_put_failure:
@@ -331,16 +366,26 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
         int result = 0, rem_txq_params = 0;
         struct nlattr *nl_txq_params;
 
-        rdev = cfg80211_get_dev_from_info(info);
-        if (IS_ERR(rdev))
-                return PTR_ERR(rdev);
+        rtnl_lock();
+
+        mutex_lock(&cfg80211_mutex);
 
-        if (info->attrs[NL80211_ATTR_WIPHY_NAME]) {
+        rdev = __cfg80211_drv_from_info(info);
+        if (IS_ERR(rdev)) {
+                result = PTR_ERR(rdev);
+                goto unlock;
+        }
+
+        mutex_lock(&rdev->mtx);
+
+        if (info->attrs[NL80211_ATTR_WIPHY_NAME])
                 result = cfg80211_dev_rename(
                         rdev, nla_data(info->attrs[NL80211_ATTR_WIPHY_NAME]));
-                if (result)
-                        goto bad_res;
-        }
+
+        mutex_unlock(&cfg80211_mutex);
+
+        if (result)
+                goto bad_res;
 
         if (info->attrs[NL80211_ATTR_WIPHY_TXQ_PARAMS]) {
                 struct ieee80211_txq_params txq_params;
@@ -436,7 +481,9 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
 
 
  bad_res:
-        cfg80211_put_dev(rdev);
+        mutex_unlock(&rdev->mtx);
+ unlock:
+        rtnl_unlock();
         return result;
 }
 
@@ -572,21 +619,31 @@ static int nl80211_set_interface(struct sk_buff *skb, struct genl_info *info)
         enum nl80211_iftype type;
         struct net_device *dev;
         u32 _flags, *flags = NULL;
+        bool change = false;
 
         memset(&params, 0, sizeof(params));
 
+        rtnl_lock();
+
         err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
         if (err)
-                return err;
+                goto unlock_rtnl;
+
         ifindex = dev->ifindex;
         type = dev->ieee80211_ptr->iftype;
         dev_put(dev);
 
-        err = -EINVAL;
         if (info->attrs[NL80211_ATTR_IFTYPE]) {
-                type = nla_get_u32(info->attrs[NL80211_ATTR_IFTYPE]);
-                if (type > NL80211_IFTYPE_MAX)
+                enum nl80211_iftype ntype;
+
+                ntype = nla_get_u32(info->attrs[NL80211_ATTR_IFTYPE]);
+                if (type != ntype)
+                        change = true;
+                type = ntype;
+                if (type > NL80211_IFTYPE_MAX) {
+                        err = -EINVAL;
                         goto unlock;
+                }
         }
 
         if (!drv->ops->change_virtual_intf ||
@@ -602,6 +659,7 @@ static int nl80211_set_interface(struct sk_buff *skb, struct genl_info *info)
                 }
                 params.mesh_id = nla_data(info->attrs[NL80211_ATTR_MESH_ID]);
                 params.mesh_id_len = nla_len(info->attrs[NL80211_ATTR_MESH_ID]);
+                change = true;
         }
 
         if (info->attrs[NL80211_ATTR_MNTR_FLAGS]) {
@@ -611,20 +669,26 @@ static int nl80211_set_interface(struct sk_buff *skb, struct genl_info *info)
                 }
                 err = parse_monitor_flags(info->attrs[NL80211_ATTR_MNTR_FLAGS],
                                           &_flags);
-                if (!err)
-                        flags = &_flags;
+                if (err)
+                        goto unlock;
+
+                flags = &_flags;
+                change = true;
         }
-        rtnl_lock();
-        err = drv->ops->change_virtual_intf(&drv->wiphy, ifindex,
-                                            type, flags, &params);
+
+        if (change)
+                err = drv->ops->change_virtual_intf(&drv->wiphy, ifindex,
+                                                    type, flags, &params);
+        else
+                err = 0;
 
         dev = __dev_get_by_index(&init_net, ifindex);
         WARN_ON(!dev || (!err && dev->ieee80211_ptr->iftype != type));
 
-        rtnl_unlock();
-
  unlock:
         cfg80211_put_dev(drv);
+ unlock_rtnl:
+        rtnl_unlock();
         return err;
 }
 
@@ -647,9 +711,13 @@ static int nl80211_new_interface(struct sk_buff *skb, struct genl_info *info)
                         return -EINVAL;
         }
 
+        rtnl_lock();
+
         drv = cfg80211_get_dev_from_info(info);
-        if (IS_ERR(drv))
-                return PTR_ERR(drv);
+        if (IS_ERR(drv)) {
+                err = PTR_ERR(drv);
+                goto unlock_rtnl;
+        }
 
         if (!drv->ops->add_virtual_intf ||
             !(drv->wiphy.interface_modes & (1 << type))) {
@@ -663,18 +731,17 @@ static int nl80211_new_interface(struct sk_buff *skb, struct genl_info *info)
                 params.mesh_id_len = nla_len(info->attrs[NL80211_ATTR_MESH_ID]);
         }
 
-        rtnl_lock();
         err = parse_monitor_flags(type == NL80211_IFTYPE_MONITOR ?
                                   info->attrs[NL80211_ATTR_MNTR_FLAGS] : NULL,
                                   &flags);
         err = drv->ops->add_virtual_intf(&drv->wiphy,
                 nla_data(info->attrs[NL80211_ATTR_IFNAME]),
                 type, err ? NULL : &flags, &params);
-        rtnl_unlock();
-
 
  unlock:
         cfg80211_put_dev(drv);
+ unlock_rtnl:
+        rtnl_unlock();
         return err;
 }
 
@@ -684,9 +751,11 @@ static int nl80211_del_interface(struct sk_buff *skb, struct genl_info *info)
         int ifindex, err;
         struct net_device *dev;
 
+        rtnl_lock();
+
         err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
         if (err)
-                return err;
+                goto unlock_rtnl;
         ifindex = dev->ifindex;
         dev_put(dev);
 
@@ -695,12 +764,12 @@ static int nl80211_del_interface(struct sk_buff *skb, struct genl_info *info)
                 goto out;
         }
 
-        rtnl_lock();
         err = drv->ops->del_virtual_intf(&drv->wiphy, ifindex);
-        rtnl_unlock();
 
  out:
         cfg80211_put_dev(drv);
+ unlock_rtnl:
+        rtnl_unlock();
         return err;
 }
 
@@ -752,9 +821,11 @@ static int nl80211_get_key(struct sk_buff *skb, struct genl_info *info)
         if (info->attrs[NL80211_ATTR_MAC])
                 mac_addr = nla_data(info->attrs[NL80211_ATTR_MAC]);
 
+        rtnl_lock();
+
         err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
         if (err)
-                return err;
+                goto unlock_rtnl;
 
         if (!drv->ops->get_key) {
                 err = -EOPNOTSUPP;
@@ -782,10 +853,8 @@ static int nl80211_get_key(struct sk_buff *skb, struct genl_info *info)
         if (mac_addr)
                 NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, mac_addr);
 
-        rtnl_lock();
         err = drv->ops->get_key(&drv->wiphy, dev, key_idx, mac_addr,
                                 &cookie, get_key_callback);
-        rtnl_unlock();
 
         if (err)
                 goto out;
@@ -803,6 +872,9 @@ static int nl80211_get_key(struct sk_buff *skb, struct genl_info *info)
  out:
         cfg80211_put_dev(drv);
         dev_put(dev);
+ unlock_rtnl:
+        rtnl_unlock();
+
         return err;
 }
 
@@ -831,9 +903,11 @@ static int nl80211_set_key(struct sk_buff *skb, struct genl_info *info)
             !info->attrs[NL80211_ATTR_KEY_DEFAULT_MGMT])
                 return -EINVAL;
 
+        rtnl_lock();
+
         err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
         if (err)
-                return err;
+                goto unlock_rtnl;
 
         if (info->attrs[NL80211_ATTR_KEY_DEFAULT])
                 func = drv->ops->set_default_key;
@@ -845,13 +919,15 @@ static int nl80211_set_key(struct sk_buff *skb, struct genl_info *info)
                 goto out;
         }
 
-        rtnl_lock();
         err = func(&drv->wiphy, dev, key_idx);
-        rtnl_unlock();
 
  out:
         cfg80211_put_dev(drv);
         dev_put(dev);
+
+ unlock_rtnl:
+        rtnl_unlock();
+
         return err;
 }
 
@@ -921,22 +997,25 @@ static int nl80211_new_key(struct sk_buff *skb, struct genl_info *info)
                 return -EINVAL;
         }
 
+        rtnl_lock();
+
         err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
         if (err)
-                return err;
+                goto unlock_rtnl;
 
         if (!drv->ops->add_key) {
                 err = -EOPNOTSUPP;
                 goto out;
         }
 
-        rtnl_lock();
         err = drv->ops->add_key(&drv->wiphy, dev, key_idx, mac_addr, &params);
-        rtnl_unlock();
 
  out:
         cfg80211_put_dev(drv);
         dev_put(dev);
+ unlock_rtnl:
+        rtnl_unlock();
+
         return err;
 }
 
@@ -957,22 +1036,26 @@ static int nl80211_del_key(struct sk_buff *skb, struct genl_info *info)
         if (info->attrs[NL80211_ATTR_MAC])
                 mac_addr = nla_data(info->attrs[NL80211_ATTR_MAC]);
 
+        rtnl_lock();
+
         err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
         if (err)
-                return err;
+                goto unlock_rtnl;
 
         if (!drv->ops->del_key) {
                 err = -EOPNOTSUPP;
                 goto out;
         }
 
-        rtnl_lock();
         err = drv->ops->del_key(&drv->wiphy, dev, key_idx, mac_addr);
-        rtnl_unlock();
 
  out:
         cfg80211_put_dev(drv);
         dev_put(dev);
+
+ unlock_rtnl:
+        rtnl_unlock();
+
         return err;
 }
 
@@ -986,9 +1069,16 @@ static int nl80211_addset_beacon(struct sk_buff *skb, struct genl_info *info)
         struct beacon_parameters params;
         int haveinfo = 0;
 
+        rtnl_lock();
+
         err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
         if (err)
-                return err;
+                goto unlock_rtnl;
+
+        if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP) {
+                err = -EOPNOTSUPP;
+                goto out;
+        }
 
         switch (info->genlhdr->cmd) {
         case NL80211_CMD_NEW_BEACON:
@@ -1049,13 +1139,14 @@ static int nl80211_addset_beacon(struct sk_buff *skb, struct genl_info *info)
                 goto out;
         }
 
-        rtnl_lock();
         err = call(&drv->wiphy, dev, &params);
-        rtnl_unlock();
 
  out:
         cfg80211_put_dev(drv);
         dev_put(dev);
+ unlock_rtnl:
+        rtnl_unlock();
+
         return err;
 }
 
@@ -1065,22 +1156,29 @@ static int nl80211_del_beacon(struct sk_buff *skb, struct genl_info *info)
         int err;
         struct net_device *dev;
 
+        rtnl_lock();
+
         err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
         if (err)
-                return err;
+                goto unlock_rtnl;
 
         if (!drv->ops->del_beacon) {
                 err = -EOPNOTSUPP;
                 goto out;
         }
 
-        rtnl_lock();
+        if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP) {
+                err = -EOPNOTSUPP;
+                goto out;
+        }
         err = drv->ops->del_beacon(&drv->wiphy, dev);
-        rtnl_unlock();
 
  out:
         cfg80211_put_dev(drv);
         dev_put(dev);
+ unlock_rtnl:
+        rtnl_unlock();
+
         return err;
 }
 
@@ -1246,30 +1344,32 @@ static int nl80211_dump_station(struct sk_buff *skb,
                         return -EINVAL;
         }
 
-        netdev = dev_get_by_index(&init_net, ifidx);
-        if (!netdev)
-                return -ENODEV;
+        rtnl_lock();
+
+        netdev = __dev_get_by_index(&init_net, ifidx);
+        if (!netdev) {
+                err = -ENODEV;
+                goto out_rtnl;
+        }
 
         dev = cfg80211_get_dev_from_ifindex(ifidx);
         if (IS_ERR(dev)) {
                 err = PTR_ERR(dev);
-                goto out_put_netdev;
+                goto out_rtnl;
         }
 
         if (!dev->ops->dump_station) {
-                err = -ENOSYS;
+                err = -EOPNOTSUPP;
                 goto out_err;
         }
 
-        rtnl_lock();
-
         while (1) {
                 err = dev->ops->dump_station(&dev->wiphy, netdev, sta_idx,
                                              mac_addr, &sinfo);
                 if (err == -ENOENT)
                         break;
                 if (err)
-                        goto out_err_rtnl;
+                        goto out_err;
 
                 if (nl80211_send_station(skb,
                                 NETLINK_CB(cb->skb).pid,
@@ -1285,12 +1385,10 @@ static int nl80211_dump_station(struct sk_buff *skb,
  out:
         cb->args[1] = sta_idx;
         err = skb->len;
- out_err_rtnl:
-        rtnl_unlock();
  out_err:
         cfg80211_put_dev(dev);
- out_put_netdev:
-        dev_put(netdev);
+ out_rtnl:
+        rtnl_unlock();
 
         return err;
 }
@@ -1311,19 +1409,18 @@ static int nl80211_get_station(struct sk_buff *skb, struct genl_info *info)
 
         mac_addr = nla_data(info->attrs[NL80211_ATTR_MAC]);
 
+        rtnl_lock();
+
         err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
         if (err)
-                return err;
+                goto out_rtnl;
 
         if (!drv->ops->get_station) {
                 err = -EOPNOTSUPP;
                 goto out;
         }
 
-        rtnl_lock();
         err = drv->ops->get_station(&drv->wiphy, dev, mac_addr, &sinfo);
-        rtnl_unlock();
-
         if (err)
                 goto out;
 
@@ -1340,10 +1437,12 @@ static int nl80211_get_station(struct sk_buff *skb, struct genl_info *info)
 
  out_free:
         nlmsg_free(msg);
-
  out:
         cfg80211_put_dev(drv);
         dev_put(dev);
+ out_rtnl:
+        rtnl_unlock();
+
         return err;
 }
 
@@ -1411,9 +1510,11 @@ static int nl80211_set_station(struct sk_buff *skb, struct genl_info *info)
                 params.plink_action =
                     nla_get_u8(info->attrs[NL80211_ATTR_STA_PLINK_ACTION]);
 
+        rtnl_lock();
+
         err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
         if (err)
-                return err;
+                goto out_rtnl;
 
         err = get_vlan(info->attrs[NL80211_ATTR_STA_VLAN], drv, &params.vlan);
         if (err)
@@ -1424,15 +1525,16 @@ static int nl80211_set_station(struct sk_buff *skb, struct genl_info *info)
                 goto out;
         }
 
-        rtnl_lock();
         err = drv->ops->change_station(&drv->wiphy, dev, mac_addr, &params);
-        rtnl_unlock();
 
  out:
         if (params.vlan)
                 dev_put(params.vlan);
         cfg80211_put_dev(drv);
         dev_put(dev);
+ out_rtnl:
+        rtnl_unlock();
+
         return err;
 }
 
@@ -1474,9 +1576,11 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info)
                                 &params.station_flags))
                 return -EINVAL;
 
+        rtnl_lock();
+
         err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
         if (err)
-                return err;
+                goto out_rtnl;
 
         err = get_vlan(info->attrs[NL80211_ATTR_STA_VLAN], drv, &params.vlan);
         if (err)
@@ -1487,15 +1591,21 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info)
                 goto out;
         }
 
-        rtnl_lock();
+        if (!netif_running(dev)) {
+                err = -ENETDOWN;
+                goto out;
+        }
+
         err = drv->ops->add_station(&drv->wiphy, dev, mac_addr, &params);
-        rtnl_unlock();
 
  out:
         if (params.vlan)
                 dev_put(params.vlan);
         cfg80211_put_dev(drv);
         dev_put(dev);
+ out_rtnl:
+        rtnl_unlock();
+
         return err;
 }
 
@@ -1509,22 +1619,25 @@ static int nl80211_del_station(struct sk_buff *skb, struct genl_info *info)
         if (info->attrs[NL80211_ATTR_MAC])
                 mac_addr = nla_data(info->attrs[NL80211_ATTR_MAC]);
 
+        rtnl_lock();
+
         err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
         if (err)
-                return err;
+                goto out_rtnl;
 
         if (!drv->ops->del_station) {
                 err = -EOPNOTSUPP;
                 goto out;
         }
 
-        rtnl_lock();
         err = drv->ops->del_station(&drv->wiphy, dev, mac_addr);
-        rtnl_unlock();
 
  out:
         cfg80211_put_dev(drv);
         dev_put(dev);
+ out_rtnl:
+        rtnl_unlock();
+
         return err;
 }
 
@@ -1605,22 +1718,29 @@ static int nl80211_dump_mpath(struct sk_buff *skb,
                         return -EINVAL;
         }
 
-        netdev = dev_get_by_index(&init_net, ifidx);
-        if (!netdev)
-                return -ENODEV;
+        rtnl_lock();
+
+        netdev = __dev_get_by_index(&init_net, ifidx);
+        if (!netdev) {
+                err = -ENODEV;
+                goto out_rtnl;
+        }
 
         dev = cfg80211_get_dev_from_ifindex(ifidx);
         if (IS_ERR(dev)) {
                 err = PTR_ERR(dev);
-                goto out_put_netdev;
+                goto out_rtnl;
         }
 
         if (!dev->ops->dump_mpath) {
-                err = -ENOSYS;
+                err = -EOPNOTSUPP;
                 goto out_err;
         }
 
-        rtnl_lock();
+        if (netdev->ieee80211_ptr->iftype != NL80211_IFTYPE_MESH_POINT) {
+                err = -EOPNOTSUPP;
+                goto out;
+        }
 
         while (1) {
                 err = dev->ops->dump_mpath(&dev->wiphy, netdev, path_idx,
@@ -1628,7 +1748,7 @@ static int nl80211_dump_mpath(struct sk_buff *skb,
                 if (err == -ENOENT)
                         break;
                 if (err)
-                        goto out_err_rtnl;
+                        goto out_err;
 
                 if (nl80211_send_mpath(skb, NETLINK_CB(cb->skb).pid,
                                        cb->nlh->nlmsg_seq, NLM_F_MULTI,
@@ -1643,12 +1763,10 @@ static int nl80211_dump_mpath(struct sk_buff *skb,
  out:
         cb->args[1] = path_idx;
         err = skb->len;
- out_err_rtnl:
-        rtnl_unlock();
  out_err:
         cfg80211_put_dev(dev);
- out_put_netdev:
-        dev_put(netdev);
+ out_rtnl:
+        rtnl_unlock();
 
         return err;
 }
@@ -1670,19 +1788,23 @@ static int nl80211_get_mpath(struct sk_buff *skb, struct genl_info *info)
 
         dst = nla_data(info->attrs[NL80211_ATTR_MAC]);
 
+        rtnl_lock();
+
         err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
         if (err)
-                return err;
+                goto out_rtnl;
 
         if (!drv->ops->get_mpath) {
                 err = -EOPNOTSUPP;
                 goto out;
         }
 
-        rtnl_lock();
-        err = drv->ops->get_mpath(&drv->wiphy, dev, dst, next_hop, &pinfo);
-        rtnl_unlock();
+        if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_MESH_POINT) {
+                err = -EOPNOTSUPP;
+                goto out;
+        }
 
+        err = drv->ops->get_mpath(&drv->wiphy, dev, dst, next_hop, &pinfo);
         if (err)
                 goto out;
 
@@ -1699,10 +1821,12 @@ static int nl80211_get_mpath(struct sk_buff *skb, struct genl_info *info)
 
  out_free:
         nlmsg_free(msg);
-
  out:
         cfg80211_put_dev(drv);
         dev_put(dev);
+ out_rtnl:
+        rtnl_unlock();
+
         return err;
 }
 
@@ -1723,22 +1847,35 @@ static int nl80211_set_mpath(struct sk_buff *skb, struct genl_info *info)
         dst = nla_data(info->attrs[NL80211_ATTR_MAC]);
         next_hop = nla_data(info->attrs[NL80211_ATTR_MPATH_NEXT_HOP]);
 
+        rtnl_lock();
+
         err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
         if (err)
-                return err;
+                goto out_rtnl;
 
         if (!drv->ops->change_mpath) {
                 err = -EOPNOTSUPP;
                 goto out;
         }
 
-        rtnl_lock();
+        if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_MESH_POINT) {
+                err = -EOPNOTSUPP;
+                goto out;
+        }
+
+        if (!netif_running(dev)) {
+                err = -ENETDOWN;
+                goto out;
+        }
+
         err = drv->ops->change_mpath(&drv->wiphy, dev, dst, next_hop);
-        rtnl_unlock();
 
  out:
         cfg80211_put_dev(drv);
         dev_put(dev);
+ out_rtnl:
+        rtnl_unlock();
+
         return err;
 }
 static int nl80211_new_mpath(struct sk_buff *skb, struct genl_info *info)
@@ -1758,22 +1895,35 @@ static int nl80211_new_mpath(struct sk_buff *skb, struct genl_info *info)
         dst = nla_data(info->attrs[NL80211_ATTR_MAC]);
         next_hop = nla_data(info->attrs[NL80211_ATTR_MPATH_NEXT_HOP]);
 
+        rtnl_lock();
+
         err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
         if (err)
-                return err;
+                goto out_rtnl;
 
         if (!drv->ops->add_mpath) {
                 err = -EOPNOTSUPP;
                 goto out;
         }
 
-        rtnl_lock();
+        if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_MESH_POINT) {
+                err = -EOPNOTSUPP;
+                goto out;
+        }
+
+        if (!netif_running(dev)) {
+                err = -ENETDOWN;
+                goto out;
+        }
+
         err = drv->ops->add_mpath(&drv->wiphy, dev, dst, next_hop);
-        rtnl_unlock();
 
  out:
         cfg80211_put_dev(drv);
         dev_put(dev);
+ out_rtnl:
+        rtnl_unlock();
+
         return err;
 }
 
@@ -1787,22 +1937,25 @@ static int nl80211_del_mpath(struct sk_buff *skb, struct genl_info *info)
         if (info->attrs[NL80211_ATTR_MAC])
                 dst = nla_data(info->attrs[NL80211_ATTR_MAC]);
 
+        rtnl_lock();
+
         err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
         if (err)
-                return err;
+                goto out_rtnl;
 
         if (!drv->ops->del_mpath) {
                 err = -EOPNOTSUPP;
                 goto out;
         }
 
-        rtnl_lock();
         err = drv->ops->del_mpath(&drv->wiphy, dev, dst);
-        rtnl_unlock();
 
  out:
         cfg80211_put_dev(drv);
         dev_put(dev);
+ out_rtnl:
+        rtnl_unlock();
+
         return err;
 }
 
@@ -1835,22 +1988,30 @@ static int nl80211_set_bss(struct sk_buff *skb, struct genl_info *info)
                         nla_len(info->attrs[NL80211_ATTR_BSS_BASIC_RATES]);
         }
 
+        rtnl_lock();
+
         err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
         if (err)
-                return err;
+                goto out_rtnl;
 
         if (!drv->ops->change_bss) {
                 err = -EOPNOTSUPP;
                 goto out;
         }
 
-        rtnl_lock();
+        if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP) {
+                err = -EOPNOTSUPP;
+                goto out;
+        }
+
         err = drv->ops->change_bss(&drv->wiphy, dev, &params);
-        rtnl_unlock();
 
  out:
         cfg80211_put_dev(drv);
         dev_put(dev);
+ out_rtnl:
+        rtnl_unlock();
+
         return err;
 }
 
@@ -1945,10 +2106,12 @@ static int nl80211_get_mesh_params(struct sk_buff *skb,
         struct nlattr *pinfoattr;
         struct sk_buff *msg;
 
+        rtnl_lock();
+
         /* Look up our device */
         err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
         if (err)
-                return err;
+                goto out_rtnl;
 
         if (!drv->ops->get_mesh_params) {
                 err = -EOPNOTSUPP;
@@ -1956,9 +2119,7 @@ static int nl80211_get_mesh_params(struct sk_buff *skb,
         }
 
         /* Get the mesh params */
-        rtnl_lock();
         err = drv->ops->get_mesh_params(&drv->wiphy, dev, &cur_params);
-        rtnl_unlock();
         if (err)
                 goto out;
 
@@ -2007,13 +2168,16 @@ static int nl80211_get_mesh_params(struct sk_buff *skb,
         err = genlmsg_unicast(msg, info->snd_pid);
         goto out;
 
-nla_put_failure:
+ nla_put_failure:
         genlmsg_cancel(msg, hdr);
         err = -EMSGSIZE;
-out:
+ out:
         /* Cleanup */
         cfg80211_put_dev(drv);
         dev_put(dev);
+ out_rtnl:
+        rtnl_unlock();
+
         return err;
 }
 
@@ -2060,9 +2224,11 @@ static int nl80211_set_mesh_params(struct sk_buff *skb, struct genl_info *info)
                         parent_attr, nl80211_meshconf_params_policy))
                 return -EINVAL;
 
+        rtnl_lock();
+
         err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
         if (err)
-                return err;
+                goto out_rtnl;
 
         if (!drv->ops->set_mesh_params) {
                 err = -EOPNOTSUPP;
@@ -2109,14 +2275,15 @@ static int nl80211_set_mesh_params(struct sk_buff *skb, struct genl_info *info)
                         nla_get_u16);
 
         /* Apply changes */
-        rtnl_lock();
         err = drv->ops->set_mesh_params(&drv->wiphy, dev, &cfg, mask);
-        rtnl_unlock();
 
  out:
         /* cleanup */
         cfg80211_put_dev(drv);
         dev_put(dev);
+ out_rtnl:
+        rtnl_unlock();
+
         return err;
 }
 
@@ -2262,43 +2429,6 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
         return -EINVAL;
 }
 
-static int nl80211_set_mgmt_extra_ie(struct sk_buff *skb,
-                                     struct genl_info *info)
-{
-        struct cfg80211_registered_device *drv;
-        int err;
-        struct net_device *dev;
-        struct mgmt_extra_ie_params params;
-
-        memset(&params, 0, sizeof(params));
-
-        if (!info->attrs[NL80211_ATTR_MGMT_SUBTYPE])
-                return -EINVAL;
-        params.subtype = nla_get_u8(info->attrs[NL80211_ATTR_MGMT_SUBTYPE]);
-        if (params.subtype > 15)
-                return -EINVAL; /* FC Subtype field is 4 bits (0..15) */
-
-        if (info->attrs[NL80211_ATTR_IE]) {
-                params.ies = nla_data(info->attrs[NL80211_ATTR_IE]);
-                params.ies_len = nla_len(info->attrs[NL80211_ATTR_IE]);
-        }
-
-        err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
-        if (err)
-                return err;
-
-        if (drv->ops->set_mgmt_extra_ie) {
-                rtnl_lock();
-                err = drv->ops->set_mgmt_extra_ie(&drv->wiphy, dev, &params);
-                rtnl_unlock();
-        } else
-                err = -EOPNOTSUPP;
-
-        cfg80211_put_dev(drv);
-        dev_put(dev);
-        return err;
-}
-
 static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info)
 {
         struct cfg80211_registered_device *drv;
@@ -2312,9 +2442,11 @@ static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info)
         enum ieee80211_band band;
         size_t ie_len;
 
+        rtnl_lock();
+
         err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
         if (err)
-                return err;
+                goto out_rtnl;
 
         wiphy = &drv->wiphy;
 
@@ -2323,11 +2455,14 @@ static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info)
                 goto out;
         }
 
-        rtnl_lock();
+        if (!netif_running(dev)) {
+                err = -ENETDOWN;
+                goto out;
+        }
 
         if (drv->scan_req) {
                 err = -EBUSY;
-                goto out_unlock;
+                goto out;
         }
 
         if (info->attrs[NL80211_ATTR_SCAN_FREQUENCIES]) {
@@ -2335,7 +2470,7 @@ static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info)
                         n_channels++;
                 if (!n_channels) {
                         err = -EINVAL;
-                        goto out_unlock;
+                        goto out;
                 }
         } else {
                 for (band = 0; band < IEEE80211_NUM_BANDS; band++)
@@ -2349,7 +2484,7 @@ static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info)
 
         if (n_ssids > wiphy->max_scan_ssids) {
                 err = -EINVAL;
-                goto out_unlock;
+                goto out;
         }
 
         if (info->attrs[NL80211_ATTR_IE])
@@ -2363,7 +2498,7 @@ static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info)
                         + ie_len, GFP_KERNEL);
         if (!request) {
                 err = -ENOMEM;
-                goto out_unlock;
+                goto out;
         }
 
         request->channels = (void *)((char *)request + sizeof(*request));
@@ -2434,11 +2569,12 @@ static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info)
                 drv->scan_req = NULL;
                 kfree(request);
         }
- out_unlock:
-        rtnl_unlock();
  out:
         cfg80211_put_dev(drv);
         dev_put(dev);
+ out_rtnl:
+        rtnl_unlock();
+
         return err;
 }
 
@@ -2558,6 +2694,288 @@ static int nl80211_dump_scan(struct sk_buff *skb,
         return err;
 }
 
+static bool nl80211_valid_auth_type(enum nl80211_auth_type auth_type)
+{
+        return auth_type == NL80211_AUTHTYPE_OPEN_SYSTEM ||
+                auth_type == NL80211_AUTHTYPE_SHARED_KEY ||
+                auth_type == NL80211_AUTHTYPE_FT ||
+                auth_type == NL80211_AUTHTYPE_NETWORK_EAP;
+}
+
+static int nl80211_authenticate(struct sk_buff *skb, struct genl_info *info)
+{
+        struct cfg80211_registered_device *drv;
+        struct net_device *dev;
+        struct cfg80211_auth_request req;
+        struct wiphy *wiphy;
+        int err;
+
+        rtnl_lock();
+
+        err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
+        if (err)
+                goto unlock_rtnl;
+
+        if (!drv->ops->auth) {
+                err = -EOPNOTSUPP;
+                goto out;
+        }
+
+        if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_STATION) {
+                err = -EOPNOTSUPP;
+                goto out;
+        }
+
+        if (!netif_running(dev)) {
+                err = -ENETDOWN;
+                goto out;
+        }
+
+        if (!info->attrs[NL80211_ATTR_MAC]) {
+                err = -EINVAL;
+                goto out;
+        }
+
+        wiphy = &drv->wiphy;
+        memset(&req, 0, sizeof(req));
+
+        req.peer_addr = nla_data(info->attrs[NL80211_ATTR_MAC]);
+
+        if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) {
+                req.chan = ieee80211_get_channel(
+                        wiphy,
+                        nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]));
+                if (!req.chan) {
+                        err = -EINVAL;
+                        goto out;
+                }
+        }
+
+        if (info->attrs[NL80211_ATTR_SSID]) {
+                req.ssid = nla_data(info->attrs[NL80211_ATTR_SSID]);
+                req.ssid_len = nla_len(info->attrs[NL80211_ATTR_SSID]);
+        }
+
+        if (info->attrs[NL80211_ATTR_IE]) {
+                req.ie = nla_data(info->attrs[NL80211_ATTR_IE]);
+                req.ie_len = nla_len(info->attrs[NL80211_ATTR_IE]);
+        }
+
+        if (info->attrs[NL80211_ATTR_AUTH_TYPE]) {
+                req.auth_type =
+                        nla_get_u32(info->attrs[NL80211_ATTR_AUTH_TYPE]);
+                if (!nl80211_valid_auth_type(req.auth_type)) {
+                        err = -EINVAL;
+                        goto out;
+                }
+        }
+
+        err = drv->ops->auth(&drv->wiphy, dev, &req);
+
+out:
+        cfg80211_put_dev(drv);
+        dev_put(dev);
+unlock_rtnl:
+        rtnl_unlock();
+        return err;
+}
+
+static int nl80211_associate(struct sk_buff *skb, struct genl_info *info)
+{
+        struct cfg80211_registered_device *drv;
+        struct net_device *dev;
+        struct cfg80211_assoc_request req;
+        struct wiphy *wiphy;
+        int err;
+
+        rtnl_lock();
+
+        err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
+        if (err)
+                goto unlock_rtnl;
+
+        if (!drv->ops->assoc) {
+                err = -EOPNOTSUPP;
+                goto out;
+        }
+
+        if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_STATION) {
+                err = -EOPNOTSUPP;
+                goto out;
+        }
+
+        if (!netif_running(dev)) {
+                err = -ENETDOWN;
+                goto out;
+        }
+
+        if (!info->attrs[NL80211_ATTR_MAC] ||
+            !info->attrs[NL80211_ATTR_SSID]) {
+                err = -EINVAL;
+                goto out;
+        }
+
+        wiphy = &drv->wiphy;
+        memset(&req, 0, sizeof(req));
+
+        req.peer_addr = nla_data(info->attrs[NL80211_ATTR_MAC]);
+
+        if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) {
+                req.chan = ieee80211_get_channel(
+                        wiphy,
+                        nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]));
+                if (!req.chan) {
+                        err = -EINVAL;
+                        goto out;
+                }
+        }
+
+        req.ssid = nla_data(info->attrs[NL80211_ATTR_SSID]);
+        req.ssid_len = nla_len(info->attrs[NL80211_ATTR_SSID]);
+
+        if (info->attrs[NL80211_ATTR_IE]) {
+                req.ie = nla_data(info->attrs[NL80211_ATTR_IE]);
+                req.ie_len = nla_len(info->attrs[NL80211_ATTR_IE]);
+        }
+
+        err = drv->ops->assoc(&drv->wiphy, dev, &req);
+
+out:
+        cfg80211_put_dev(drv);
+        dev_put(dev);
+unlock_rtnl:
+        rtnl_unlock();
+        return err;
+}
+
+static int nl80211_deauthenticate(struct sk_buff *skb, struct genl_info *info)
+{
+        struct cfg80211_registered_device *drv;
+        struct net_device *dev;
+        struct cfg80211_deauth_request req;
+        struct wiphy *wiphy;
+        int err;
+
+        rtnl_lock();
+
+        err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
+        if (err)
+                goto unlock_rtnl;
+
+        if (!drv->ops->deauth) {
+                err = -EOPNOTSUPP;
+                goto out;
+        }
+
+        if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_STATION) {
+                err = -EOPNOTSUPP;
+                goto out;
+        }
+
+        if (!netif_running(dev)) {
+                err = -ENETDOWN;
+                goto out;
+        }
+
+        if (!info->attrs[NL80211_ATTR_MAC]) {
+                err = -EINVAL;
+                goto out;
+        }
+
+        wiphy = &drv->wiphy;
+        memset(&req, 0, sizeof(req));
+
+        req.peer_addr = nla_data(info->attrs[NL80211_ATTR_MAC]);
+
+        if (info->attrs[NL80211_ATTR_REASON_CODE]) {
+                req.reason_code =
+                        nla_get_u16(info->attrs[NL80211_ATTR_REASON_CODE]);
+                if (req.reason_code == 0) {
+                        /* Reason Code 0 is reserved */
+                        err = -EINVAL;
+                        goto out;
+                }
+        }
+
+        if (info->attrs[NL80211_ATTR_IE]) {
+                req.ie = nla_data(info->attrs[NL80211_ATTR_IE]);
+                req.ie_len = nla_len(info->attrs[NL80211_ATTR_IE]);
+        }
+
+        err = drv->ops->deauth(&drv->wiphy, dev, &req);
+
+out:
+        cfg80211_put_dev(drv);
+        dev_put(dev);
+unlock_rtnl:
+        rtnl_unlock();
+        return err;
+}
+
+static int nl80211_disassociate(struct sk_buff *skb, struct genl_info *info)
+{
+        struct cfg80211_registered_device *drv;
+        struct net_device *dev;
+        struct cfg80211_disassoc_request req;
+        struct wiphy *wiphy;
+        int err;
+
+        rtnl_lock();
+
+        err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
+        if (err)
+                goto unlock_rtnl;
+
+        if (!drv->ops->disassoc) {
+                err = -EOPNOTSUPP;
+                goto out;
+        }
+
+        if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_STATION) {
+                err = -EOPNOTSUPP;
+                goto out;
+        }
+
+        if (!netif_running(dev)) {
+                err = -ENETDOWN;
+                goto out;
+        }
+
+        if (!info->attrs[NL80211_ATTR_MAC]) {
+                err = -EINVAL;
+                goto out;
+        }
+
+        wiphy = &drv->wiphy;
+        memset(&req, 0, sizeof(req));
+
+        req.peer_addr = nla_data(info->attrs[NL80211_ATTR_MAC]);
+
+        if (info->attrs[NL80211_ATTR_REASON_CODE]) {
+                req.reason_code =
+                        nla_get_u16(info->attrs[NL80211_ATTR_REASON_CODE]);
+                if (req.reason_code == 0) {
+                        /* Reason Code 0 is reserved */
+                        err = -EINVAL;
+                        goto out;
+                }
+        }
+
+        if (info->attrs[NL80211_ATTR_IE]) {
+                req.ie = nla_data(info->attrs[NL80211_ATTR_IE]);
+                req.ie_len = nla_len(info->attrs[NL80211_ATTR_IE]);
+        }
+
+        err = drv->ops->disassoc(&drv->wiphy, dev, &req);
+
+out:
+        cfg80211_put_dev(drv);
+        dev_put(dev);
+unlock_rtnl:
+        rtnl_unlock();
+        return err;
+}
+
 static struct genl_ops nl80211_ops[] = {
         {
                 .cmd = NL80211_CMD_GET_WIPHY,
@@ -2725,12 +3143,6 @@ static struct genl_ops nl80211_ops[] = {
                 .flags = GENL_ADMIN_PERM,
         },
         {
-                .cmd = NL80211_CMD_SET_MGMT_EXTRA_IE,
-                .doit = nl80211_set_mgmt_extra_ie,
-                .policy = nl80211_policy,
-                .flags = GENL_ADMIN_PERM,
-        },
-        {
                 .cmd = NL80211_CMD_TRIGGER_SCAN,
                 .doit = nl80211_trigger_scan,
                 .policy = nl80211_policy,
@@ -2741,6 +3153,33 @@ static struct genl_ops nl80211_ops[] = {
                 .policy = nl80211_policy,
                 .dumpit = nl80211_dump_scan,
         },
+        {
+                .cmd = NL80211_CMD_AUTHENTICATE,
+                .doit = nl80211_authenticate,
+                .policy = nl80211_policy,
+                .flags = GENL_ADMIN_PERM,
+        },
+        {
+                .cmd = NL80211_CMD_ASSOCIATE,
+                .doit = nl80211_associate,
+                .policy = nl80211_policy,
+                .flags = GENL_ADMIN_PERM,
+        },
+        {
+                .cmd = NL80211_CMD_DEAUTHENTICATE,
+                .doit = nl80211_deauthenticate,
+                .policy = nl80211_policy,
+                .flags = GENL_ADMIN_PERM,
+        },
+        {
+                .cmd = NL80211_CMD_DISASSOCIATE,
+                .doit = nl80211_disassociate,
+                .policy = nl80211_policy,
+                .flags = GENL_ADMIN_PERM,
+        },
+};
+static struct genl_multicast_group nl80211_mlme_mcgrp = {
+        .name = "mlme",
 };
 
 /* multicast groups */
@@ -2887,6 +3326,71 @@ nla_put_failure:
         nlmsg_free(msg);
 }
 
+static void nl80211_send_mlme_event(struct cfg80211_registered_device *rdev,
+                                    struct net_device *netdev,
+                                    const u8 *buf, size_t len,
+                                    enum nl80211_commands cmd)
+{
+        struct sk_buff *msg;
+        void *hdr;
+
+        msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+        if (!msg)
+                return;
+
+        hdr = nl80211hdr_put(msg, 0, 0, 0, cmd);
+        if (!hdr) {
+                nlmsg_free(msg);
+                return;
+        }
+
+        NLA_PUT_U32(msg, NL80211_ATTR_WIPHY, rdev->wiphy_idx);
+        NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, netdev->ifindex);
+        NLA_PUT(msg, NL80211_ATTR_FRAME, len, buf);
+
+        if (genlmsg_end(msg, hdr) < 0) {
+                nlmsg_free(msg);
+                return;
+        }
+
+        genlmsg_multicast(msg, 0, nl80211_mlme_mcgrp.id, GFP_KERNEL);
+        return;
+
+ nla_put_failure:
+        genlmsg_cancel(msg, hdr);
+        nlmsg_free(msg);
+}
+
+void nl80211_send_rx_auth(struct cfg80211_registered_device *rdev,
+                          struct net_device *netdev, const u8 *buf, size_t len)
+{
+        nl80211_send_mlme_event(rdev, netdev, buf, len,
+                                NL80211_CMD_AUTHENTICATE);
+}
+
+void nl80211_send_rx_assoc(struct cfg80211_registered_device *rdev,
+                           struct net_device *netdev, const u8 *buf,
+                           size_t len)
+{
+        nl80211_send_mlme_event(rdev, netdev, buf, len, NL80211_CMD_ASSOCIATE);
+}
+
+void nl80211_send_rx_deauth(struct cfg80211_registered_device *rdev,
+                            struct net_device *netdev, const u8 *buf,
+                            size_t len)
+{
+        nl80211_send_mlme_event(rdev, netdev, buf, len,
+                                NL80211_CMD_DEAUTHENTICATE);
+}
+
+void nl80211_send_rx_disassoc(struct cfg80211_registered_device *rdev,
+                              struct net_device *netdev, const u8 *buf,
+                              size_t len)
+{
+        nl80211_send_mlme_event(rdev, netdev, buf, len,
+                                NL80211_CMD_DISASSOCIATE);
+}
+
 /* initialisation/exit functions */
 
 int nl80211_init(void)
@@ -2915,6 +3419,10 @@ int nl80211_init(void)
         if (err)
                 goto err_out;
 
+        err = genl_register_mc_group(&nl80211_fam, &nl80211_mlme_mcgrp);
+        if (err)
+                goto err_out;
+
         return 0;
  err_out:
         genl_unregister_family(&nl80211_fam);
diff --git a/net/wireless/nl80211.h b/net/wireless/nl80211.h
index e65a3c38c52f..b77af4ab80be 100644
--- a/net/wireless/nl80211.h
+++ b/net/wireless/nl80211.h
@@ -3,7 +3,6 @@
 
 #include "core.h"
 
-#ifdef CONFIG_NL80211
 extern int nl80211_init(void);
 extern void nl80211_exit(void);
 extern void nl80211_notify_dev_rename(struct cfg80211_registered_device *rdev);
@@ -12,30 +11,17 @@ extern void nl80211_send_scan_done(struct cfg80211_registered_device *rdev,
 extern void nl80211_send_scan_aborted(struct cfg80211_registered_device *rdev,
                                       struct net_device *netdev);
 extern void nl80211_send_reg_change_event(struct regulatory_request *request);
-#else
-static inline int nl80211_init(void)
-{
-        return 0;
-}
-static inline void nl80211_exit(void)
-{
-}
-static inline void nl80211_notify_dev_rename(
-        struct cfg80211_registered_device *rdev)
-{
-}
-static inline void
-nl80211_send_scan_done(struct cfg80211_registered_device *rdev,
-                       struct net_device *netdev)
-{}
-static inline void nl80211_send_scan_aborted(
-                                        struct cfg80211_registered_device *rdev,
-                                        struct net_device *netdev)
-{}
-static inline void
-nl80211_send_reg_change_event(struct regulatory_request *request)
-{
-}
-#endif /* CONFIG_NL80211 */
+extern void nl80211_send_rx_auth(struct cfg80211_registered_device *rdev,
+                                 struct net_device *netdev,
+                                 const u8 *buf, size_t len);
+extern void nl80211_send_rx_assoc(struct cfg80211_registered_device *rdev,
+                                  struct net_device *netdev,
+                                  const u8 *buf, size_t len);
+extern void nl80211_send_rx_deauth(struct cfg80211_registered_device *rdev,
+                                   struct net_device *netdev,
+                                   const u8 *buf, size_t len);
+extern void nl80211_send_rx_disassoc(struct cfg80211_registered_device *rdev,
+                                     struct net_device *netdev,
+                                     const u8 *buf, size_t len);
 
 #endif /* __NET_WIRELESS_NL80211_H */
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index eb8b8ed16155..6327e1617acb 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -122,9 +122,14 @@ static const struct ieee80211_regdomain *cfg80211_world_regdom =
 
 #ifdef CONFIG_WIRELESS_OLD_REGULATORY
 static char *ieee80211_regdom = "US";
+#else
+static char *ieee80211_regdom = "00";
+#endif
+
 module_param(ieee80211_regdom, charp, 0444);
 MODULE_PARM_DESC(ieee80211_regdom, "IEEE 802.11 regulatory domain code");
 
+#ifdef CONFIG_WIRELESS_OLD_REGULATORY
 /*
  * We assume 40 MHz bandwidth for the old regulatory work.
  * We make emphasis we are using the exact same frequencies
@@ -1415,16 +1420,6 @@ new_request:
                 return r;
         }
 
-        /*
-         * Note: When CONFIG_WIRELESS_OLD_REGULATORY is enabled
-         * AND if CRDA is NOT present nothing will happen, if someone
-         * wants to bother with 11d with OLD_REG you can add a timer.
-         * If after x amount of time nothing happens you can call:
-         *
-         * return set_regdom(country_ie_regdomain);
-         *
-         * to intersect with the static rd
-         */
         return call_crda(last_request->alpha2);
 }
 
@@ -1601,6 +1596,10 @@ static bool reg_same_country_ie_hint(struct wiphy *wiphy,
 
         assert_cfg80211_lock();
 
+        if (unlikely(last_request->initiator !=
+            NL80211_REGDOM_SET_BY_COUNTRY_IE))
+                return false;
+
         request_wiphy = wiphy_idx_to_wiphy(last_request->wiphy_idx);
 
         if (!request_wiphy)
@@ -1663,7 +1662,9 @@ void regulatory_hint_11d(struct wiphy *wiphy,
          * we optimize an early check to exit out early if we don't have to
          * do anything
          */
-        if (likely(wiphy_idx_valid(last_request->wiphy_idx))) {
+        if (likely(last_request->initiator ==
+            NL80211_REGDOM_SET_BY_COUNTRY_IE &&
+            wiphy_idx_valid(last_request->wiphy_idx))) {
                 struct cfg80211_registered_device *drv_last_ie;
 
                 drv_last_ie =
@@ -2022,28 +2023,21 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
          */
 
         BUG_ON(!country_ie_regdomain);
+        BUG_ON(rd == country_ie_regdomain);
 
-        if (rd != country_ie_regdomain) {
-                /*
-                 * Intersect what CRDA returned and our what we
-                 * had built from the Country IE received
-                 */
+        /*
+         * Intersect what CRDA returned and our what we
+         * had built from the Country IE received
+         */
 
-                intersected_rd = regdom_intersect(rd, country_ie_regdomain);
+        intersected_rd = regdom_intersect(rd, country_ie_regdomain);
 
-                reg_country_ie_process_debug(rd, country_ie_regdomain,
-                        intersected_rd);
+        reg_country_ie_process_debug(rd,
+                                     country_ie_regdomain,
+                                     intersected_rd);
 
-                kfree(country_ie_regdomain);
-                country_ie_regdomain = NULL;
-        } else {
-                /*
-                 * This would happen when CRDA was not present and
-                 * OLD_REGULATORY was enabled. We intersect our Country
-                 * IE rd and what was set on cfg80211 originally
-                 */
-                intersected_rd = regdom_intersect(rd, cfg80211_regdomain);
-        }
+        kfree(country_ie_regdomain);
+        country_ie_regdomain = NULL;
 
         if (!intersected_rd)
                 return -EINVAL;
@@ -2135,15 +2129,18 @@ int regulatory_init(void)
         /*
          * The old code still requests for a new regdomain and if
          * you have CRDA you get it updated, otherwise you get
-         * stuck with the static values. We ignore "EU" code as
-         * that is not a valid ISO / IEC 3166 alpha2
+         * stuck with the static values. Since "EU" is not a valid
+         * ISO / IEC 3166 alpha2 code we can't expect userpace to
+         * give us a regulatory domain for it. We need last_request
+         * iniitalized though so lets just send a request which we
+         * know will be ignored... this crap will be removed once
+         * OLD_REG dies.
          */
-        if (ieee80211_regdom[0] != 'E' || ieee80211_regdom[1] != 'U')
-                err = regulatory_hint_core(ieee80211_regdom);
+        err = regulatory_hint_core(ieee80211_regdom);
 #else
         cfg80211_regdomain = cfg80211_world_regdom;
 
-        err = regulatory_hint_core("00");
+        err = regulatory_hint_core(ieee80211_regdom);
 #endif
         if (err) {
                 if (err == -ENOMEM)
diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index 280dbcd02c15..2a00e362f5fe 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -80,7 +80,8 @@ void cfg80211_bss_expire(struct cfg80211_registered_device *dev)
         bool expired = false;
 
         list_for_each_entry_safe(bss, tmp, &dev->bss_list, list) {
-                if (!time_after(jiffies, bss->ts + IEEE80211_SCAN_RESULT_EXPIRE))
+                if (bss->hold ||
+                    !time_after(jiffies, bss->ts + IEEE80211_SCAN_RESULT_EXPIRE))
                         continue;
                 list_del(&bss->list);
                 rb_erase(&bss->rbn, &dev->bss_tree);
@@ -471,6 +472,30 @@ void cfg80211_unlink_bss(struct wiphy *wiphy, struct cfg80211_bss *pub)
 }
 EXPORT_SYMBOL(cfg80211_unlink_bss);
 
+void cfg80211_hold_bss(struct cfg80211_bss *pub)
+{
+        struct cfg80211_internal_bss *bss;
+
+        if (!pub)
+                return;
+
+        bss = container_of(pub, struct cfg80211_internal_bss, pub);
+        bss->hold = true;
+}
+EXPORT_SYMBOL(cfg80211_hold_bss);
+
+void cfg80211_unhold_bss(struct cfg80211_bss *pub)
+{
+        struct cfg80211_internal_bss *bss;
+
+        if (!pub)
+                return;
+
+        bss = container_of(pub, struct cfg80211_internal_bss, pub);
+        bss->hold = false;
+}
+EXPORT_SYMBOL(cfg80211_unhold_bss);
+
 #ifdef CONFIG_WIRELESS_EXT
 int cfg80211_wext_siwscan(struct net_device *dev,
                           struct iw_request_info *info,
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index b84a9b4fe96a..0fd1db6e95bb 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -66,6 +66,7 @@ int cfg80211_wext_siwmode(struct net_device *dev, struct iw_request_info *info,
         struct cfg80211_registered_device *rdev;
         struct vif_params vifparams;
         enum nl80211_iftype type;
+        int ret;
 
         if (!wdev)
                 return -EOPNOTSUPP;
@@ -96,10 +97,16 @@ int cfg80211_wext_siwmode(struct net_device *dev, struct iw_request_info *info,
                 return -EINVAL;
         }
 
+        if (type == wdev->iftype)
+                return 0;
+
         memset(&vifparams, 0, sizeof(vifparams));
 
-        return rdev->ops->change_virtual_intf(wdev->wiphy, dev->ifindex, type,
-                                              NULL, &vifparams);
+        ret = rdev->ops->change_virtual_intf(wdev->wiphy, dev->ifindex, type,
+                                             NULL, &vifparams);
+        WARN_ON(!ret && wdev->iftype != type);
+
+        return ret;
 }
 EXPORT_SYMBOL(cfg80211_wext_siwmode);