compat_sys_wait4() prototype misannotation

[safe/jmp/linux-2.6] / net / mac80211 / ieee80211_iface.c

diff --git a/net/mac80211/ieee80211_iface.c b/net/mac80211/ieee80211_iface.c
index 2ba24ef..92f1eb2 100644 (file)
--- a/net/mac80211/ieee80211_iface.c
+++ b/net/mac80211/ieee80211_iface.c
@@ -22,7 +22,6 @@ void ieee80211_if_sdata_init(struct ieee80211_sub_if_data *sdata)
 
        /* Default values for sub-interface parameters */
        sdata->drop_unencrypted = 0;
-       sdata->eapol = 1;
        for (i = 0; i < IEEE80211_FRAGMENT_MAX; i++)
                skb_queue_head_init(&sdata->fragments[i].skb_list);
 
@@ -48,7 +47,7 @@ int ieee80211_if_add(struct net_device *dev, const char *name,
        int ret;
 
        ASSERT_RTNL();
-       ndev = alloc_netdev(sizeof(struct ieee80211_sub_if_data),
+       ndev = alloc_netdev(sizeof(*sdata) + local->hw.vif_data_size,
                            name, ieee80211_if_setup);
        if (!ndev)
                return -ENOMEM;
@@ -67,7 +66,7 @@ int ieee80211_if_add(struct net_device *dev, const char *name,
        sdata = IEEE80211_DEV_TO_SUB_IF(ndev);
        ndev->ieee80211_ptr = &sdata->wdev;
        sdata->wdev.wiphy = local->hw.wiphy;
-       sdata->type = IEEE80211_IF_TYPE_AP;
+       sdata->vif.type = IEEE80211_IF_TYPE_AP;
        sdata->dev = ndev;
        sdata->local = local;
        ieee80211_if_sdata_init(sdata);
@@ -96,77 +95,37 @@ fail:
        return ret;
 }
 
-int ieee80211_if_add_mgmt(struct ieee80211_local *local)
-{
-       struct net_device *ndev;
-       struct ieee80211_sub_if_data *nsdata;
-       int ret;
-
-       ASSERT_RTNL();
-
-       ndev = alloc_netdev(sizeof(struct ieee80211_sub_if_data), "wmgmt%d",
-                           ieee80211_if_mgmt_setup);
-       if (!ndev)
-               return -ENOMEM;
-       ret = dev_alloc_name(ndev, ndev->name);
-       if (ret < 0)
-               goto fail;
-
-       memcpy(ndev->dev_addr, local->hw.wiphy->perm_addr, ETH_ALEN);
-       SET_NETDEV_DEV(ndev, wiphy_dev(local->hw.wiphy));
-
-       nsdata = IEEE80211_DEV_TO_SUB_IF(ndev);
-       ndev->ieee80211_ptr = &nsdata->wdev;
-       nsdata->wdev.wiphy = local->hw.wiphy;
-       nsdata->type = IEEE80211_IF_TYPE_MGMT;
-       nsdata->dev = ndev;
-       nsdata->local = local;
-       ieee80211_if_sdata_init(nsdata);
-
-       ret = register_netdevice(ndev);
-       if (ret)
-               goto fail;
-
-       ieee80211_debugfs_add_netdev(nsdata);
-
-       if (local->open_count > 0)
-               dev_open(ndev);
-       local->apdev = ndev;
-       return 0;
-
-fail:
-       free_netdev(ndev);
-       return ret;
-}
-
-void ieee80211_if_del_mgmt(struct ieee80211_local *local)
-{
-       struct net_device *apdev;
-
-       ASSERT_RTNL();
-       apdev = local->apdev;
-       ieee80211_debugfs_remove_netdev(IEEE80211_DEV_TO_SUB_IF(apdev));
-       local->apdev = NULL;
-       unregister_netdevice(apdev);
-}
-
 void ieee80211_if_set_type(struct net_device *dev, int type)
 {
        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-       int oldtype = sdata->type;
+       int oldtype = sdata->vif.type;
+
+       /*
+        * We need to call this function on the master interface
+        * which already has a hard_start_xmit routine assigned
+        * which must not be changed.
+        */
+       if (dev != sdata->local->mdev)
+               dev->hard_start_xmit = ieee80211_subif_start_xmit;
+
+       /*
+        * Called even when register_netdevice fails, it would
+        * oops if assigned before initialising the rest.
+        */
+       dev->uninit = ieee80211_if_reinit;
+
+       /* most have no BSS pointer */
+       sdata->bss = NULL;
+       sdata->vif.type = type;
 
-       dev->hard_start_xmit = ieee80211_subif_start_xmit;
-
-       sdata->type = type;
        switch (type) {
        case IEEE80211_IF_TYPE_WDS:
-               sdata->bss = NULL;
+               /* nothing special */
                break;
        case IEEE80211_IF_TYPE_VLAN:
                sdata->u.vlan.ap = NULL;
                break;
        case IEEE80211_IF_TYPE_AP:
-               sdata->u.ap.dtim_period = 2;
                sdata->u.ap.force_unicast_rateidx = -1;
                sdata->u.ap.max_ratectrl_rateidx = -1;
                skb_queue_head_init(&sdata->u.ap.ps_bc_buf);
@@ -213,6 +172,7 @@ void ieee80211_if_reinit(struct net_device *dev)
        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
        struct sta_info *sta;
+       struct sk_buff *skb;
 
        ASSERT_RTNL();
 
@@ -220,7 +180,11 @@ void ieee80211_if_reinit(struct net_device *dev)
 
        ieee80211_if_sdata_deinit(sdata);
 
-       switch (sdata->type) {
+       switch (sdata->vif.type) {
+       case IEEE80211_IF_TYPE_INVALID:
+               /* cannot happen */
+               WARN_ON(1);
+               break;
        case IEEE80211_IF_TYPE_AP: {
                /* Remove all virtual interfaces that use this BSS
                 * as their sdata->bss */
@@ -242,16 +206,11 @@ void ieee80211_if_reinit(struct net_device *dev)
                        }
                }
 
-               kfree(sdata->u.ap.beacon_head);
-               kfree(sdata->u.ap.beacon_tail);
-               kfree(sdata->u.ap.generic_elem);
+               kfree(sdata->u.ap.beacon);
 
-               if (dev != local->mdev) {
-                       struct sk_buff *skb;
-                       while ((skb = skb_dequeue(&sdata->u.ap.ps_bc_buf))) {
-                               local->total_ps_buffered--;
-                               dev_kfree_skb(skb);
-                       }
+               while ((skb = skb_dequeue(&sdata->u.ap.ps_bc_buf))) {
+                       local->total_ps_buffered--;
+                       dev_kfree_skb(skb);
                }
 
                break;
@@ -318,7 +277,7 @@ int ieee80211_if_remove(struct net_device *dev, const char *name, int id)
        ASSERT_RTNL();
 
        list_for_each_entry_safe(sdata, n, &local->interfaces, list) {
-               if ((sdata->type == id || id == -1) &&
+               if ((sdata->vif.type == id || id == -1) &&
                    strcmp(name, sdata->dev->name) == 0 &&
                    sdata->dev != local->mdev) {
                        list_del_rcu(&sdata->list);
@@ -332,11 +291,8 @@ int ieee80211_if_remove(struct net_device *dev, const char *name, int id)
 
 void ieee80211_if_free(struct net_device *dev)
 {
-       struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
 
-       /* local->apdev must be NULL when freeing management interface */
-       BUG_ON(dev == local->apdev);
        ieee80211_if_sdata_deinit(sdata);
        free_netdev(dev);
 }