wifi: mac80211: move monitor work to wiphy work

Again this serves to simplify the locking in mac80211
in the future, since this is a relatively complex work.

Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 72955758a846adba9f901d54c029ee2904154032..1cb29a67a2c75b4c0fd5d1a4a553f7a6126ad7c0 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -473,7 +473,7 @@ struct ieee80211_if_managed {
        struct timer_list timer;
        struct timer_list conn_mon_timer;
        struct timer_list bcn_mon_timer;
-       struct work_struct monitor_work;
+       struct wiphy_work monitor_work;
        struct wiphy_work beacon_connection_loss_work;
        struct wiphy_work csa_connection_drop_work;
 

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 5644e25ec5fe84af6380d2a917246c6ef7f2a468..ab0be5c3086079d1f02cd344afbe42fcaef60a92 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -6683,10 +6683,11 @@ static void ieee80211_sta_conn_mon_timer(struct timer_list *t)
                return;
        }
 
-       ieee80211_queue_work(&local->hw, &ifmgd->monitor_work);
+       wiphy_work_queue(local->hw.wiphy, &sdata->u.mgd.monitor_work);
 }
 
-static void ieee80211_sta_monitor_work(struct work_struct *work)
+static void ieee80211_sta_monitor_work(struct wiphy *wiphy,
+                                      struct wiphy_work *work)
 {
        struct ieee80211_sub_if_data *sdata =
                container_of(work, struct ieee80211_sub_if_data,
@@ -6702,8 +6703,8 @@ static void ieee80211_restart_sta_timer(struct ieee80211_sub_if_data *sdata)
 
                /* let's probe the connection once */
                if (!ieee80211_hw_check(&sdata->local->hw, CONNECTION_MONITOR))
-                       ieee80211_queue_work(&sdata->local->hw,
-                                            &sdata->u.mgd.monitor_work);
+                       wiphy_work_queue(sdata->local->hw.wiphy,
+                                        &sdata->u.mgd.monitor_work);
        }
 }
 
@@ -6821,7 +6822,7 @@ void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata)
 {
        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
 
-       INIT_WORK(&ifmgd->monitor_work, ieee80211_sta_monitor_work);
+       wiphy_work_init(&ifmgd->monitor_work, ieee80211_sta_monitor_work);
        wiphy_work_init(&ifmgd->beacon_connection_loss_work,
                        ieee80211_beacon_connection_loss_work);
        wiphy_work_init(&ifmgd->csa_connection_drop_work,
@@ -7850,7 +7851,8 @@ void ieee80211_mgd_stop(struct ieee80211_sub_if_data *sdata)
         * they will not do anything but might not have been
         * cancelled when disconnecting.
         */
-       cancel_work_sync(&ifmgd->monitor_work);
+       wiphy_work_cancel(sdata->local->hw.wiphy,
+                         &ifmgd->monitor_work);
        wiphy_work_cancel(sdata->local->hw.wiphy,
                          &ifmgd->beacon_connection_loss_work);
        wiphy_work_cancel(sdata->local->hw.wiphy,