mac80211: use common work struct

IBSS, managed and mesh modes all have their
own work struct, and in the future we want
to also use it in other modes to process
frames from the now common skb queue.

This also makes the skb queue and work safe
to use from other interface types.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 5 insertions, 7 deletions

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 854ef4ed2cfa..75b896d47ea1 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1653,7 +1653,7 @@ ieee80211_rx_result ieee80211_sta_rx_mgmt(struct ieee80211_sub_if_data *sdata,
         case IEEE80211_STYPE_DISASSOC:
         case IEEE80211_STYPE_ACTION:
                 skb_queue_tail(&sdata->skb_queue, skb);
-                ieee80211_queue_work(&local->hw, &sdata->u.mgd.work);
+                ieee80211_queue_work(&local->hw, &sdata->work);
                 return RX_QUEUED;
         }
 
@@ -1779,13 +1779,13 @@ static void ieee80211_sta_timer(unsigned long data)
                 return;
         }
 
-        ieee80211_queue_work(&local->hw, &ifmgd->work);
+        ieee80211_queue_work(&local->hw, &sdata->work);
 }
 
 static void ieee80211_sta_work(struct work_struct *work)
 {
         struct ieee80211_sub_if_data *sdata =
-                container_of(work, struct ieee80211_sub_if_data, u.mgd.work);
+                container_of(work, struct ieee80211_sub_if_data, work);
         struct ieee80211_local *local = sdata->local;
         struct ieee80211_if_managed *ifmgd;
         struct sk_buff *skb;
@@ -1906,8 +1906,7 @@ static void ieee80211_restart_sta_timer(struct ieee80211_sub_if_data *sdata)
                 ieee80211_queue_work(&sdata->local->hw,
                            &sdata->u.mgd.monitor_work);
                 /* and do all the other regular work too */
-                ieee80211_queue_work(&sdata->local->hw,
-                           &sdata->u.mgd.work);
+                ieee80211_queue_work(&sdata->local->hw, &sdata->work);
         }
 }
 
@@ -1922,7 +1921,6 @@ void ieee80211_sta_quiesce(struct ieee80211_sub_if_data *sdata)
          * time -- the code here is properly synchronised.
          */
 
-        cancel_work_sync(&ifmgd->work);
         cancel_work_sync(&ifmgd->beacon_connection_loss_work);
         if (del_timer_sync(&ifmgd->timer))
                 set_bit(TMR_RUNNING_TIMER, &ifmgd->timers_running);
@@ -1954,7 +1952,7 @@ void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata)
         struct ieee80211_if_managed *ifmgd;
 
         ifmgd = &sdata->u.mgd;
-        INIT_WORK(&ifmgd->work, ieee80211_sta_work);
+        INIT_WORK(&sdata->work, ieee80211_sta_work);
         INIT_WORK(&ifmgd->monitor_work, ieee80211_sta_monitor_work);
         INIT_WORK(&ifmgd->chswitch_work, ieee80211_chswitch_work);
         INIT_WORK(&ifmgd->beacon_connection_loss_work,