1 files changed, 6 insertions, 7 deletions

diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index a9ff904620db..18c4266cca1f 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -761,7 +761,7 @@ static void ieee80211_ibss_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
 static void ieee80211_ibss_work(struct work_struct *work)
 {
         struct ieee80211_sub_if_data *sdata =
-                container_of(work, struct ieee80211_sub_if_data, u.ibss.work);
+                container_of(work, struct ieee80211_sub_if_data, work);
         struct ieee80211_local *local = sdata->local;
         struct ieee80211_if_ibss *ifibss;
         struct sk_buff *skb;
@@ -804,7 +804,7 @@ static void ieee80211_queue_ibss_work(struct ieee80211_sub_if_data *sdata)
         struct ieee80211_local *local = sdata->local;
 
         set_bit(IEEE80211_IBSS_REQ_RUN, &ifibss->request);
-        ieee80211_queue_work(&local->hw, &ifibss->work);
+        ieee80211_queue_work(&local->hw, &sdata->work);
 }
 
 static void ieee80211_ibss_timer(unsigned long data)
@@ -827,7 +827,6 @@ void ieee80211_ibss_quiesce(struct ieee80211_sub_if_data *sdata)
 {
         struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;
 
-        cancel_work_sync(&ifibss->work);
         if (del_timer_sync(&ifibss->timer))
                 ifibss->timer_running = true;
 }
@@ -847,7 +846,7 @@ void ieee80211_ibss_setup_sdata(struct ieee80211_sub_if_data *sdata)
 {
         struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;
 
-        INIT_WORK(&ifibss->work, ieee80211_ibss_work);
+        INIT_WORK(&sdata->work, ieee80211_ibss_work);
         setup_timer(&ifibss->timer, ieee80211_ibss_timer,
                     (unsigned long) sdata);
 }
@@ -890,7 +889,7 @@ ieee80211_ibss_rx_mgmt(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb)
         case IEEE80211_STYPE_PROBE_REQ:
         case IEEE80211_STYPE_AUTH:
                 skb_queue_tail(&sdata->skb_queue, skb);
-                ieee80211_queue_work(&local->hw, &sdata->u.ibss.work);
+                ieee80211_queue_work(&local->hw, &sdata->work);
                 return RX_QUEUED;
         }
 
@@ -956,7 +955,7 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,
         ieee80211_recalc_idle(sdata->local);
 
         set_bit(IEEE80211_IBSS_REQ_RUN, &sdata->u.ibss.request);
-        ieee80211_queue_work(&sdata->local->hw, &sdata->u.ibss.work);
+        ieee80211_queue_work(&sdata->local->hw, &sdata->work);
 
         return 0;
 }
@@ -967,7 +966,7 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata)
 
         del_timer_sync(&sdata->u.ibss.timer);
         clear_bit(IEEE80211_IBSS_REQ_RUN, &sdata->u.ibss.request);
-        cancel_work_sync(&sdata->u.ibss.work);
+        cancel_work_sync(&sdata->work);
         clear_bit(IEEE80211_IBSS_REQ_RUN, &sdata->u.ibss.request);
 
         sta_info_flush(sdata->local, sdata);