[45/76] wifi: mac80211: replace link_id with link_conf in start/stop_ap()

Message ID	20220713114425.04ff106a9b9e.I83fe22e7216099b3d1fd962bcf33b79e145cbdb2@changeid
State	New
Headers	show Return-Path: <linux-wireless-owner@kernel.org> From: Johannes Berg <johannes@sipsolutions.net> To: linux-wireless@vger.kernel.org Cc: Gregory Greenman <gregory.greenman@intel.com> Subject: [PATCH 45/76] wifi: mac80211: replace link_id with link_conf in start/stop_ap() Date: Wed, 13 Jul 2022 11:44:31 +0200 Message-Id: <20220713114425.04ff106a9b9e.I83fe22e7216099b3d1fd962bcf33b79e145cbdb2@changeid> In-Reply-To: <20220713094502.163926-1-johannes@sipsolutions.net> References: <20220713094502.163926-1-johannes@sipsolutions.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	wifi: more MLO work \| expand [00/76] wifi: more MLO work [01/76] wifi: mac80211_hwsim: Support link channel matching on rx [02/76] wifi: mac80211: consistently use sdata_dereference() [03/76] wifi: mac80211: rx: accept link-addressed frames [04/76] wifi: mac80211: Consider MLO links in offchannel logic [05/76] wifi: cfg80211: Allow MLO TX with link source address [06/76] wifi: mac80211: Remove AP SMPS leftovers [07/76] wifi: mac80211: add an ieee80211_get_link_sband [08/76] wifi: cfg80211: add API to add/modify/remove a link station [09/76] wifi: cfg80211/mac80211: separate link params from station params [10/76] wifi: mac80211: implement callbacks for <add/mod/del>_link_station [11/76] wifi: nl80211: hold wdev mutex in add/mod/del link station [12/76] wifi: nl80211: hold wdev mutex for channel switch APIs [13/76] wifi: nl80211: hold wdev mutex for station APIs [14/76] wifi: mac80211: RCU-ify link/link_conf pointers [15/76] wifi: nl80211: enable setting the link address at new station [16/76] wifi: cfg80211: make cfg80211_auth_request::key_idx signed [17/76] wifi: cfg80211: drop BSS elements from assoc trace for now [18/76] wifi: mac80211_hwsim: Ack link addressed frames [19/76] wifi: mac80211: debug: omit link if non-MLO connection [20/76] wifi: mac80211: skip powersave recalc if driver SUPPORTS_DYNAMIC_PS [21/76] wifi: mac80211: separate out connection downgrade flags [22/76] wifi: mac80211: fix key lookup [23/76] wifi: nl80211: acquire wdev mutex for dump_survey [24/76] wifi: mac80211: move ieee80211_request_smps_mgd_work [25/76] wifi: mac80211: set up/tear down client vif links properly [26/76] wifi: mac80211: provide link ID in link_conf [27/76] wifi: mac80211: move ps setting to vif config [28/76] wifi: mac80211: expect powersave handling in driver for MLO [29/76] wifi: mac80211: change QoS settings API to take link into account [30/76] wifi: mac80211: remove unused bssid variable [31/76] wifi: mac80211: mlme: track AP (MLD) address separately [32/76] wifi: mac80211: mlme: do IEEE80211_STA_RESET_SIGNAL_AVE per link [33/76] wifi: mac80211: mlme: first adjustments for MLO [34/76] wifi: mac80211: split IEEE80211_STA_DISABLE_WMM to link data [35/76] wifi: mac80211: mlme: use ieee80211_get_link_sband() [36/76] wifi: mac80211: mlme: remove sta argument from ieee80211_config_bw [37/76] wifi: mac80211: mlme: use correct link_sta [38/76] wifi: cfg80211: remove BSS pointer from cfg80211_disassoc_request [39/76] wifi: cfg80211: prepare association failure APIs for MLO [40/76] wifi: mac80211: mlme: unify assoc data event sending [41/76] wifi: cfg80211: adjust assoc comeback for MLO [42/76] wifi: cfg80211: put cfg80211_rx_assoc_resp() arguments into a struct [43/76] wifi: cfg80211: extend cfg80211_rx_assoc_resp() for MLO [44/76] wifi: mac80211: refactor elements parsing with parameter struct [45/76] wifi: mac80211: replace link_id with link_conf in start/stop_ap() [46/76] wifi: mac80211: don't re-parse elems in ieee80211_assoc_success() [47/76] wifi: mac80211: move tdls_chan_switch_prohibited to link data [48/76] wifi: mac80211: fix multi-BSSID element parsing [49/76] wifi: mac80211: don't set link address for station [50/76] wifi: mac80211: remove redundant condition [51/76] wifi: cfg80211: add ieee80211_chanwidth_rate_flags() [52/76] wifi: mac80211: use only channel width in ieee80211_parse_bitrates() [53/76] wifi: mac80211: refactor adding rates to assoc request [54/76] wifi: mac80211: refactor adding custom elements [55/76] wifi: mac80211: mlme: simplify adding ht/vht/he/eht elements [56/76] wifi: mac80211: consider EHT element size in assoc request [57/76] wifi: cfg80211: clean up links appropriately [58/76] wifi: mac80211: tighten locking check [59/76] wifi: mac80211: fix link manipulation [60/76] wifi: nl80211: better validate link ID for stations [61/76] wifi: nl80211: add EML/MLD capabilities to per-iftype capabilities [62/76] wifi: nl80211: set BSS to NULL if IS_ERR() [63/76] wifi: mac80211: skip rate statistics for MLD STAs [64/76] wifi: mac80211: add a helper to fragment an element [65/76] wifi: nl80211: check MLO support in authenticate [66/76] wifi: nl80211: Support MLD parameters in nl80211_set_station() [67/76] wifi: cfg80211/mac80211: Support control port TX from specific link [68/76] wifi: mac80211: Allow EAPOL frames from link addresses [69/76] wifi: mac80211: Allow EAPOL tx from specific link [70/76] wifi: nl80211: allow link ID in set_wiphy with frequency [71/76] wifi: mac80211: don't check carrier in chanctx code [72/76] wifi: mac80211: Support multi link in ieee80211_recalc_min_chandef() [73/76] wifi: nl80211: advertise MLO support [74/76] wifi: mac80211: replace link_id with link_conf in switch/(un)assign_vif_chanctx() [75/76] wifi: mac80211: remove link_id parameter from link_info_changed() [76/76] wifi: cfg80211: set country_elem to NULL

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c index 3de558f286a1..126106ea62d3 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c @@ -2397,7 +2397,7 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm, static int iwl_mvm_start_ap_ibss(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - unsigned int link_id) + struct ieee80211_bss_conf *link_conf) { struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw); struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif); @@ -2525,20 +2525,20 @@ static int iwl_mvm_start_ap_ibss(struct ieee80211_hw *hw, static int iwl_mvm_start_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - unsigned int link_id) + struct ieee80211_bss_conf *link_conf) { - return iwl_mvm_start_ap_ibss(hw, vif, link_id); + return iwl_mvm_start_ap_ibss(hw, vif, link_conf); } static int iwl_mvm_start_ibss(struct ieee80211_hw *hw, struct ieee80211_vif *vif) { - return iwl_mvm_start_ap_ibss(hw, vif, 0); + return iwl_mvm_start_ap_ibss(hw, vif, &vif->bss_conf); } static void iwl_mvm_stop_ap_ibss(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - unsigned int link_id) + struct ieee80211_bss_conf *link_conf) { struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw); struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif); @@ -2603,15 +2603,15 @@ static void iwl_mvm_stop_ap_ibss(struct ieee80211_hw *hw, static void iwl_mvm_stop_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - unsigned int link_id) + struct ieee80211_bss_conf *link_conf) { - iwl_mvm_stop_ap_ibss(hw, vif, link_id); + iwl_mvm_stop_ap_ibss(hw, vif, link_conf); } static void iwl_mvm_stop_ibss(struct ieee80211_hw *hw, struct ieee80211_vif *vif) { - iwl_mvm_stop_ap_ibss(hw, vif, 0); + iwl_mvm_stop_ap_ibss(hw, vif, &vif->bss_conf); } static void diff --git a/drivers/net/wireless/realtek/rtw88/mac80211.c b/drivers/net/wireless/realtek/rtw88/mac80211.c index bb7291665d37..c7b98a0599d5 100644 --- a/drivers/net/wireless/realtek/rtw88/mac80211.c +++ b/drivers/net/wireless/realtek/rtw88/mac80211.c @@ -430,7 +430,8 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw, } static int rtw_ops_start_ap(struct ieee80211_hw *hw, - struct ieee80211_vif *vif, unsigned int link_id) + struct ieee80211_vif *vif, + struct ieee80211_bss_conf *link_conf) { struct rtw_dev *rtwdev = hw->priv; struct rtw_chip_info *chip = rtwdev->chip; diff --git a/drivers/net/wireless/realtek/rtw89/mac80211.c b/drivers/net/wireless/realtek/rtw89/mac80211.c index f40569c8575c..cef27e781ae2 100644 --- a/drivers/net/wireless/realtek/rtw89/mac80211.c +++ b/drivers/net/wireless/realtek/rtw89/mac80211.c @@ -382,7 +382,8 @@ static void rtw89_ops_bss_info_changed(struct ieee80211_hw *hw, } static int rtw89_ops_start_ap(struct ieee80211_hw *hw, - struct ieee80211_vif *vif, unsigned int link_id) + struct ieee80211_vif *vif, + struct ieee80211_bss_conf *link_conf) { struct rtw89_dev *rtwdev = hw->priv; struct rtw89_vif *rtwvif = (struct rtw89_vif *)vif->drv_priv; @@ -403,7 +404,7 @@ static int rtw89_ops_start_ap(struct ieee80211_hw *hw, static void rtw89_ops_stop_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - unsigned int link_id) + struct ieee80211_bss_conf *link_conf) { struct rtw89_dev *rtwdev = hw->priv; struct rtw89_vif *rtwvif = (struct rtw89_vif *)vif->drv_priv; diff --git a/drivers/net/wireless/silabs/wfx/sta.c b/drivers/net/wireless/silabs/wfx/sta.c index 89402afe4fe6..920bd1a4a1b1 100644 --- a/drivers/net/wireless/silabs/wfx/sta.c +++ b/drivers/net/wireless/silabs/wfx/sta.c @@ -380,7 +380,7 @@ static void wfx_set_mfp_ap(struct wfx_vif *wvif) } int wfx_start_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - unsigned int link_id) + struct ieee80211_bss_conf *link_conf) { struct wfx_vif *wvif = (struct wfx_vif *)vif->drv_priv; struct wfx_dev *wdev = wvif->wdev; @@ -399,7 +399,7 @@ int wfx_start_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif, } void wfx_stop_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - unsigned int link_id) + struct ieee80211_bss_conf *link_conf) { struct wfx_vif *wvif = (struct wfx_vif *)vif->drv_priv; diff --git a/drivers/net/wireless/silabs/wfx/sta.h b/drivers/net/wireless/silabs/wfx/sta.h index 6558c5698cc8..bf2e76167a6f 100644 --- a/drivers/net/wireless/silabs/wfx/sta.h +++ b/drivers/net/wireless/silabs/wfx/sta.h @@ -30,9 +30,9 @@ void wfx_configure_filter(struct ieee80211_hw *hw, unsigned int changed_flags, int wfx_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif); void wfx_remove_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif); int wfx_start_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - unsigned int link_id); + struct ieee80211_bss_conf *link_conf); void wfx_stop_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - unsigned int link_id); + struct ieee80211_bss_conf *link_conf); int wfx_join_ibss(struct ieee80211_hw *hw, struct ieee80211_vif *vif); void wfx_leave_ibss(struct ieee80211_hw *hw, struct ieee80211_vif *vif); int wfx_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 398da2336707..d080d7e38d0f 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -4092,9 +4092,9 @@ struct ieee80211_ops { u64 changed); int (*start_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - unsigned int link_id); + struct ieee80211_bss_conf *link_conf); void (*stop_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - unsigned int link_id); + struct ieee80211_bss_conf *link_conf); u64 (*prepare_multicast)(struct ieee80211_hw *hw, struct netdev_hw_addr_list *mc_list); diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 8a37f1402328..873e1acc8c30 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1296,7 +1296,7 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev, changed |= BSS_CHANGED_UNSOL_BCAST_PROBE_RESP; } - err = drv_start_ap(sdata->local, sdata, link_id); + err = drv_start_ap(sdata->local, sdata, link_conf); if (err) { old = sdata_dereference(link->u.ap.beacon, sdata); @@ -1457,7 +1457,7 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev, GFP_KERNEL); } - drv_stop_ap(sdata->local, sdata, link_id); + drv_stop_ap(sdata->local, sdata, link_conf); /* free all potentially still buffered bcast frames */ local->total_ps_buffered -= skb_queue_len(&sdata->u.ap.ps.bc_buf); diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h index eb16a354338c..a04a88d122b7 100644 --- a/net/mac80211/driver-ops.h +++ b/net/mac80211/driver-ops.h @@ -987,32 +987,38 @@ int drv_switch_vif_chanctx(struct ieee80211_local *local, static inline int drv_start_ap(struct ieee80211_local *local, struct ieee80211_sub_if_data *sdata, - unsigned int link_id) + struct ieee80211_bss_conf *link_conf) { int ret = 0; + /* make sure link_conf is protected */ + sdata_assert_lock(sdata); + might_sleep(); if (!check_sdata_in_driver(sdata)) return -EIO; - trace_drv_start_ap(local, sdata, link_id); + trace_drv_start_ap(local, sdata, link_conf); if (local->ops->start_ap) - ret = local->ops->start_ap(&local->hw, &sdata->vif, link_id); + ret = local->ops->start_ap(&local->hw, &sdata->vif, link_conf); trace_drv_return_int(local, ret); return ret; } static inline void drv_stop_ap(struct ieee80211_local *local, struct ieee80211_sub_if_data *sdata, - unsigned int link_id) + struct ieee80211_bss_conf *link_conf) { + /* make sure link_conf is protected */ + sdata_assert_lock(sdata); + if (!check_sdata_in_driver(sdata)) return; - trace_drv_stop_ap(local, sdata, link_id); + trace_drv_stop_ap(local, sdata, link_conf); if (local->ops->stop_ap) - local->ops->stop_ap(&local->hw, &sdata->vif, link_id); + local->ops->stop_ap(&local->hw, &sdata->vif, link_conf); trace_drv_return_void(local); } diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h index b6f12ac91849..75e5c1376351 100644 --- a/net/mac80211/trace.h +++ b/net/mac80211/trace.h @@ -1754,9 +1754,9 @@ DEFINE_EVENT(local_sdata_chanctx, drv_unassign_vif_chanctx, TRACE_EVENT(drv_start_ap, TP_PROTO(struct ieee80211_local *local, struct ieee80211_sub_if_data *sdata, - unsigned int link_id), + struct ieee80211_bss_conf *link_conf), - TP_ARGS(local, sdata, link_id), + TP_ARGS(local, sdata, link_conf), TP_STRUCT__entry( LOCAL_ENTRY @@ -1769,17 +1769,12 @@ TRACE_EVENT(drv_start_ap, ), TP_fast_assign( - struct ieee80211_bss_conf *info = - sdata_dereference(sdata->vif.link_conf[link_id], sdata); - LOCAL_ASSIGN; VIF_ASSIGN; - __entry->link_id = link_id; - if (info) { - __entry->dtimper = info->dtim_period; - __entry->bcnint = info->beacon_int; - __entry->hidden_ssid = info->hidden_ssid; - } + __entry->link_id = link_conf->link_id; + __entry->dtimper = link_conf->dtim_period; + __entry->bcnint = link_conf->beacon_int; + __entry->hidden_ssid = link_conf->hidden_ssid; memcpy(__get_dynamic_array(ssid), sdata->vif.cfg.ssid, sdata->vif.cfg.ssid_len); @@ -1794,9 +1789,9 @@ TRACE_EVENT(drv_start_ap, TRACE_EVENT(drv_stop_ap, TP_PROTO(struct ieee80211_local *local, struct ieee80211_sub_if_data *sdata, - unsigned int link_id), + struct ieee80211_bss_conf *link_conf), - TP_ARGS(local, sdata, link_id), + TP_ARGS(local, sdata, link_conf), TP_STRUCT__entry( LOCAL_ENTRY @@ -1807,7 +1802,7 @@ TRACE_EVENT(drv_stop_ap, TP_fast_assign( LOCAL_ASSIGN; VIF_ASSIGN; - __entry->link_id = link_id; + __entry->link_id = link_conf->link_id; ), TP_printk( diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 78fb0c3aa4ad..f7c127a434b8 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -2576,7 +2576,8 @@ int ieee80211_reconfig(struct ieee80211_local *local) changed |= BSS_CHANGED_AP_PROBE_RESP; if (rcu_access_pointer(sdata->deflink.u.ap.beacon)) - drv_start_ap(local, sdata, 0); + drv_start_ap(local, sdata, + sdata->deflink.conf); } fallthrough; case NL80211_IFTYPE_MESH_POINT:

[45/76] wifi: mac80211: replace link_id with link_conf in start/stop_ap()

Commit Message

Patch