Commit 2bf57b00 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

wifi: mac80211: update the rx_chains after set_antenna() 



rx_chains was set only upon registration and it we rely on it for the
active chains upon SMPS configuration after association.

When we use the set_antenna() API to limit the rx_chains from 2 to 1,
this caused issues with iwlwifi since we still had 2 active_chains
requested.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230920211508.2dde4da246b2.I904223c868c77cf2ba132a3088fe6506fcbb443b@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent b3239498

net/mac80211/cfg.c

+7 −1
Original line number Diff line number Diff line
@@ -4044,11 +4044,17 @@ ieee80211_update_mgmt_frame_registrations(struct wiphy *wiphy, 
static int ieee80211_set_antenna(struct wiphy *wiphy, u32 tx_ant, u32 rx_ant)

{

	struct ieee80211_local *local = wiphy_priv(wiphy);

	int ret;



	if (local->started)

		return -EOPNOTSUPP;



	return drv_set_antenna(local, tx_ant, rx_ant);

	ret = drv_set_antenna(local, tx_ant, rx_ant);

	if (ret)

		return ret;



	local->rx_chains = hweight8(rx_ant);

	return 0;

}



static int ieee80211_get_antenna(struct wiphy *wiphy, u32 *tx_ant, u32 *rx_ant)