Commit 95749c10 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-for-net-2022-03-02' of... 

Merge tag 'wireless-for-net-2022-03-02' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless

Johannes Berg says:

====================
Three more fixes:
 - fix build issue in iwlwifi, now that I understood
   what's going on there
 - propagate error in iwlwifi/mvm to userspace so it
   can figure out what's happening
 - fix channel switch related updates in P2P-client
   in cfg80211

* tag 'wireless-for-net-2022-03-02' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless:
  iwlwifi: mvm: return value for request_ownership
  nl80211: Update bss channel on channel switch for P2P_CLIENT
  iwlwifi: fix build error for IWLMEI
====================

Link: https://lore.kernel.org/r/20220302214444.100180-1-johannes@sipsolutions.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 90f8f4c0 e6e91ec9

drivers/net/wireless/intel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -5,3 +5,4 @@ obj-$(CONFIG_IPW2200) += ipw2x00/ 
obj-$(CONFIG_IWLEGACY)	+= iwlegacy/



obj-$(CONFIG_IWLWIFI)	+= iwlwifi/

obj-$(CONFIG_IWLMEI)	+= iwlwifi/

drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c

+3 −2
Original line number Diff line number Diff line
@@ -71,12 +71,13 @@ static int iwl_mvm_vendor_host_get_ownership(struct wiphy *wiphy, 
{

	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);

	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);

	int ret;



	mutex_lock(&mvm->mutex);

	iwl_mvm_mei_get_ownership(mvm);

	ret = iwl_mvm_mei_get_ownership(mvm);

	mutex_unlock(&mvm->mutex);



	return 0;

	return ret;

}



static const struct wiphy_vendor_command iwl_mvm_vendor_commands[] = {

net/wireless/nl80211.c

+2 −1
Original line number Diff line number Diff line
@@ -17828,7 +17828,8 @@ void cfg80211_ch_switch_notify(struct net_device *dev, 
	wdev->chandef = *chandef;

	wdev->preset_chandef = *chandef;



	if (wdev->iftype == NL80211_IFTYPE_STATION &&

	if ((wdev->iftype == NL80211_IFTYPE_STATION ||

	     wdev->iftype == NL80211_IFTYPE_P2P_CLIENT) &&

	    !WARN_ON(!wdev->current_bss))

		cfg80211_update_assoc_bss_entry(wdev, chandef->chan);