nl80211: Add MLME primitives to support external SME
[safe/jmp/linux-2.6] / net / wireless / nl80211.c
index badccf9..9e1318d 100644 (file)
@@ -7,7 +7,6 @@
 #include <linux/if.h>
 #include <linux/module.h>
 #include <linux/err.h>
-#include <linux/mutex.h>
 #include <linux/list.h>
 #include <linux/if_ether.h>
 #include <linux/ieee80211.h>
@@ -112,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 */
@@ -132,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;
@@ -142,7 +147,7 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,
        if (!hdr)
                return -1;
 
-       NLA_PUT_U32(msg, NL80211_ATTR_WIPHY, dev->idx);
+       NLA_PUT_U32(msg, NL80211_ATTR_WIPHY, dev->wiphy_idx);
        NLA_PUT_STRING(msg, NL80211_ATTR_WIPHY_NAME, wiphy_name(&dev->wiphy));
        NLA_PUT_U8(msg, NL80211_ATTR_MAX_NUM_SCAN_SSIDS,
                   dev->wiphy.max_scan_ssids);
@@ -243,6 +248,36 @@ 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(set_mgmt_extra_ie, SET_MGMT_EXTRA_IE);
+       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:
@@ -256,7 +291,7 @@ static int nl80211_dump_wiphy(struct sk_buff *skb, struct netlink_callback *cb)
        int start = cb->args[0];
        struct cfg80211_registered_device *dev;
 
-       mutex_lock(&cfg80211_drv_mutex);
+       mutex_lock(&cfg80211_mutex);
        list_for_each_entry(dev, &cfg80211_drv_list, list) {
                if (++idx <= start)
                        continue;
@@ -267,7 +302,7 @@ static int nl80211_dump_wiphy(struct sk_buff *skb, struct netlink_callback *cb)
                        break;
                }
        }
-       mutex_unlock(&cfg80211_drv_mutex);
+       mutex_unlock(&cfg80211_mutex);
 
        cb->args[0] = idx;
 
@@ -470,7 +505,7 @@ static int nl80211_dump_interface(struct sk_buff *skb, struct netlink_callback *
        struct cfg80211_registered_device *dev;
        struct wireless_dev *wdev;
 
-       mutex_lock(&cfg80211_drv_mutex);
+       mutex_lock(&cfg80211_mutex);
        list_for_each_entry(dev, &cfg80211_drv_list, list) {
                if (wp_idx < wp_start) {
                        wp_idx++;
@@ -497,7 +532,7 @@ static int nl80211_dump_interface(struct sk_buff *skb, struct netlink_callback *
                wp_idx++;
        }
  out:
-       mutex_unlock(&cfg80211_drv_mutex);
+       mutex_unlock(&cfg80211_mutex);
 
        cb->args[0] = wp_idx;
        cb->args[1] = if_idx;
@@ -576,9 +611,12 @@ static int nl80211_set_interface(struct sk_buff *skb, struct genl_info *info)
 
        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);
@@ -615,17 +653,17 @@ static int nl80211_set_interface(struct sk_buff *skb, struct genl_info *info)
                if (!err)
                        flags = &_flags;
        }
-       rtnl_lock();
+
        err = drv->ops->change_virtual_intf(&drv->wiphy, ifindex,
                                            type, flags, &params);
 
        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;
 }
 
@@ -648,9 +686,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))) {
@@ -664,18 +706,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;
 }
 
@@ -685,9 +726,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);
 
@@ -696,12 +739,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;
 }
 
@@ -753,9 +796,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;
@@ -783,10 +828,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;
@@ -804,6 +847,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;
 }
 
@@ -832,9 +878,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;
@@ -846,13 +894,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;
 }
 
@@ -922,22 +972,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;
 }
 
@@ -958,22 +1011,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;
 }
 
@@ -987,9 +1044,11 @@ 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;
 
        switch (info->genlhdr->cmd) {
        case NL80211_CMD_NEW_BEACON:
@@ -1050,13 +1109,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;
 }
 
@@ -1066,22 +1126,25 @@ 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();
        err = drv->ops->del_beacon(&drv->wiphy, dev);
-       rtnl_unlock();
 
  out:
        cfg80211_put_dev(drv);
        dev_put(dev);
+ unlock_rtnl:
+       rtnl_unlock();
+
        return err;
 }
 
@@ -1247,14 +1310,18 @@ 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) {
@@ -1262,15 +1329,13 @@ static int nl80211_dump_station(struct sk_buff *skb,
                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,
@@ -1286,12 +1351,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;
 }
@@ -1312,19 +1375,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;
 
@@ -1341,10 +1403,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;
 }
 
@@ -1412,9 +1476,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)
@@ -1425,15 +1491,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;
 }
 
@@ -1475,9 +1542,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)
@@ -1488,15 +1557,16 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info)
                goto out;
        }
 
-       rtnl_lock();
        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;
 }
 
@@ -1510,22 +1580,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;
 }
 
@@ -1606,14 +1679,18 @@ 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) {
@@ -1621,15 +1698,13 @@ static int nl80211_dump_mpath(struct sk_buff *skb,
                goto out_err;
        }
 
-       rtnl_lock();
-
        while (1) {
                err = dev->ops->dump_mpath(&dev->wiphy, netdev, path_idx,
                                           dst, next_hop, &pinfo);
                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,
@@ -1644,12 +1719,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;
 }
@@ -1671,19 +1744,18 @@ 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 (err)
                goto out;
 
@@ -1700,10 +1772,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;
 }
 
@@ -1724,22 +1798,25 @@ 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();
        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)
@@ -1759,22 +1836,25 @@ 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();
        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;
 }
 
@@ -1788,22 +1868,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;
 }
 
@@ -1836,22 +1919,25 @@ 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();
        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;
 }
 
@@ -1906,6 +1992,19 @@ static int nl80211_req_set_reg(struct sk_buff *skb, struct genl_info *info)
        int r;
        char *data = NULL;
 
+       /*
+        * You should only get this when cfg80211 hasn't yet initialized
+        * completely when built-in to the kernel right between the time
+        * window between nl80211_init() and regulatory_init(), if that is
+        * even possible.
+        */
+       mutex_lock(&cfg80211_mutex);
+       if (unlikely(!cfg80211_regdomain)) {
+               mutex_unlock(&cfg80211_mutex);
+               return -EINPROGRESS;
+       }
+       mutex_unlock(&cfg80211_mutex);
+
        if (!info->attrs[NL80211_ATTR_REG_ALPHA2])
                return -EINVAL;
 
@@ -1916,14 +2015,9 @@ static int nl80211_req_set_reg(struct sk_buff *skb, struct genl_info *info)
        if (is_world_regdom(data))
                return -EINVAL;
 #endif
-       mutex_lock(&cfg80211_drv_mutex);
-       r = __regulatory_hint(NULL, REGDOM_SET_BY_USER, data, 0, ENVIRON_ANY);
-       mutex_unlock(&cfg80211_drv_mutex);
-       /* This means the regulatory domain was already set, however
-        * we don't want to confuse userspace with a "successful error"
-        * message so lets just treat it as a success */
-       if (r == -EALREADY)
-               r = 0;
+
+       r = regulatory_hint_user(data);
+
        return r;
 }
 
@@ -1938,15 +2032,20 @@ 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;
+               goto out;
+       }
 
        /* Get the mesh params */
-       rtnl_lock();
        err = drv->ops->get_mesh_params(&drv->wiphy, dev, &cur_params);
-       rtnl_unlock();
        if (err)
                goto out;
 
@@ -1995,13 +2094,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;
 }
 
@@ -2048,9 +2150,16 @@ 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;
+               goto out;
+       }
 
        /* This makes sure that there aren't more than 32 mesh config
         * parameters (otherwise our bitfield scheme would not work.) */
@@ -2092,13 +2201,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;
 }
 
@@ -2112,7 +2223,7 @@ static int nl80211_get_reg(struct sk_buff *skb, struct genl_info *info)
        unsigned int i;
        int err = -EINVAL;
 
-       mutex_lock(&cfg80211_drv_mutex);
+       mutex_lock(&cfg80211_mutex);
 
        if (!cfg80211_regdomain)
                goto out;
@@ -2175,7 +2286,7 @@ nla_put_failure:
        genlmsg_cancel(msg, hdr);
        err = -EMSGSIZE;
 out:
-       mutex_unlock(&cfg80211_drv_mutex);
+       mutex_unlock(&cfg80211_mutex);
        return err;
 }
 
@@ -2234,9 +2345,9 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
 
        BUG_ON(rule_idx != num_rules);
 
-       mutex_lock(&cfg80211_drv_mutex);
+       mutex_lock(&cfg80211_mutex);
        r = set_regdom(rd);
-       mutex_unlock(&cfg80211_drv_mutex);
+       mutex_unlock(&cfg80211_mutex);
        return r;
 
  bad_reg:
@@ -2265,19 +2376,22 @@ static int nl80211_set_mgmt_extra_ie(struct sk_buff *skb,
                params.ies_len = nla_len(info->attrs[NL80211_ATTR_IE]);
        }
 
+       rtnl_lock();
+
        err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
        if (err)
-               return err;
+               goto out_rtnl;
 
-       if (drv->ops->set_mgmt_extra_ie) {
-               rtnl_lock();
+       if (drv->ops->set_mgmt_extra_ie)
                err = drv->ops->set_mgmt_extra_ie(&drv->wiphy, dev, &params);
-               rtnl_unlock();
-       } else
+       else
                err = -EOPNOTSUPP;
 
        cfg80211_put_dev(drv);
        dev_put(dev);
+ out_rtnl:
+       rtnl_unlock();
+
        return err;
 }
 
@@ -2294,9 +2408,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;
 
@@ -2305,11 +2421,9 @@ static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info)
                goto out;
        }
 
-       rtnl_lock();
-
        if (drv->scan_req) {
                err = -EBUSY;
-               goto out_unlock;
+               goto out;
        }
 
        if (info->attrs[NL80211_ATTR_SCAN_FREQUENCIES]) {
@@ -2317,7 +2431,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++)
@@ -2331,7 +2445,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])
@@ -2345,7 +2459,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));
@@ -2416,11 +2530,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;
 }
 
@@ -2457,7 +2572,7 @@ static int nl80211_send_bss(struct sk_buff *msg, u32 pid, u32 seq, int flags,
        NLA_PUT_U16(msg, NL80211_BSS_CAPABILITY, res->capability);
        NLA_PUT_U32(msg, NL80211_BSS_FREQUENCY, res->channel->center_freq);
 
-       switch (res->signal_type) {
+       switch (rdev->wiphy.signal_type) {
        case CFG80211_SIGNAL_TYPE_MBM:
                NLA_PUT_U32(msg, NL80211_BSS_SIGNAL_MBM, res->signal);
                break;
@@ -2540,6 +2655,228 @@ static int nl80211_dump_scan(struct sk_buff *skb,
        return err;
 }
 
+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 (!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]);
+       }
+
+       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 (!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;
+               }
+       }
+
+       if (nla_len(info->attrs[NL80211_ATTR_SSID]) > IEEE80211_MAX_SSID_LEN) {
+               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 (!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 (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 (!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 (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,
@@ -2626,7 +2963,6 @@ static struct genl_ops nl80211_ops[] = {
                .doit = nl80211_get_station,
                .dumpit = nl80211_dump_station,
                .policy = nl80211_policy,
-               .flags = GENL_ADMIN_PERM,
        },
        {
                .cmd = NL80211_CMD_SET_STATION,
@@ -2724,6 +3060,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 */
@@ -2733,6 +3096,9 @@ static struct genl_multicast_group nl80211_config_mcgrp = {
 static struct genl_multicast_group nl80211_scan_mcgrp = {
        .name = "scan",
 };
+static struct genl_multicast_group nl80211_regulatory_mcgrp = {
+       .name = "regulatory",
+};
 
 /* notification functions */
 
@@ -2764,7 +3130,7 @@ static int nl80211_send_scan_donemsg(struct sk_buff *msg,
        if (!hdr)
                return -1;
 
-       NLA_PUT_U32(msg, NL80211_ATTR_WIPHY, rdev->idx);
+       NLA_PUT_U32(msg, NL80211_ATTR_WIPHY, rdev->wiphy_idx);
        NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, netdev->ifindex);
 
        /* XXX: we should probably bounce back the request? */
@@ -2812,6 +3178,126 @@ void nl80211_send_scan_aborted(struct cfg80211_registered_device *rdev,
        genlmsg_multicast(msg, 0, nl80211_scan_mcgrp.id, GFP_KERNEL);
 }
 
+/*
+ * This can happen on global regulatory changes or device specific settings
+ * based on custom world regulatory domains.
+ */
+void nl80211_send_reg_change_event(struct regulatory_request *request)
+{
+       struct sk_buff *msg;
+       void *hdr;
+
+       msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+       if (!msg)
+               return;
+
+       hdr = nl80211hdr_put(msg, 0, 0, 0, NL80211_CMD_REG_CHANGE);
+       if (!hdr) {
+               nlmsg_free(msg);
+               return;
+       }
+
+       /* Userspace can always count this one always being set */
+       NLA_PUT_U8(msg, NL80211_ATTR_REG_INITIATOR, request->initiator);
+
+       if (request->alpha2[0] == '0' && request->alpha2[1] == '0')
+               NLA_PUT_U8(msg, NL80211_ATTR_REG_TYPE,
+                          NL80211_REGDOM_TYPE_WORLD);
+       else if (request->alpha2[0] == '9' && request->alpha2[1] == '9')
+               NLA_PUT_U8(msg, NL80211_ATTR_REG_TYPE,
+                          NL80211_REGDOM_TYPE_CUSTOM_WORLD);
+       else if ((request->alpha2[0] == '9' && request->alpha2[1] == '8') ||
+                request->intersect)
+               NLA_PUT_U8(msg, NL80211_ATTR_REG_TYPE,
+                          NL80211_REGDOM_TYPE_INTERSECTION);
+       else {
+               NLA_PUT_U8(msg, NL80211_ATTR_REG_TYPE,
+                          NL80211_REGDOM_TYPE_COUNTRY);
+               NLA_PUT_STRING(msg, NL80211_ATTR_REG_ALPHA2, request->alpha2);
+       }
+
+       if (wiphy_idx_valid(request->wiphy_idx))
+               NLA_PUT_U32(msg, NL80211_ATTR_WIPHY, request->wiphy_idx);
+
+       if (genlmsg_end(msg, hdr) < 0) {
+               nlmsg_free(msg);
+               return;
+       }
+
+       genlmsg_multicast(msg, 0, nl80211_regulatory_mcgrp.id, GFP_KERNEL);
+
+       return;
+
+nla_put_failure:
+       genlmsg_cancel(msg, hdr);
+       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)
@@ -2836,6 +3322,14 @@ int nl80211_init(void)
        if (err)
                goto err_out;
 
+       err = genl_register_mc_group(&nl80211_fam, &nl80211_regulatory_mcgrp);
+       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);