Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f791eb4 authored by Luciano Coelho's avatar Luciano Coelho Committed by Johannes Berg
Browse files

mac80211: allow channel switch with multiple channel contexts 



Channel switch with multiple channel contexts should now work fine.
Remove check that disallows switches when multiple contexts are in
use.

Signed-off-by: default avatarLuciano Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 0c21e632

drivers/net/wireless/iwlegacy/4965-mac.c

+1 −1
Original line number Diff line number Diff line
@@ -6063,7 +6063,7 @@ il4965_mac_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
}



void

il4965_mac_channel_switch(struct ieee80211_hw *hw,

il4965_mac_channel_switch(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

			  struct ieee80211_channel_switch *ch_switch)

{

	struct il_priv *il = hw->priv;

drivers/net/wireless/iwlegacy/4965.h

+3 −2
Original line number Diff line number Diff line
@@ -187,7 +187,8 @@ int il4965_mac_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
			    u8 buf_size);

int il4965_mac_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

		       struct ieee80211_sta *sta);

void il4965_mac_channel_switch(struct ieee80211_hw *hw,

void

il4965_mac_channel_switch(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

			  struct ieee80211_channel_switch *ch_switch);



void il4965_led_enable(struct il_priv *il);

drivers/net/wireless/iwlwifi/dvm/mac80211.c

+1 −0
Original line number Diff line number Diff line
@@ -941,6 +941,7 @@ static int iwlagn_mac_sta_state(struct ieee80211_hw *hw, 
}



static void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,

				      struct ieee80211_vif *vif,

				      struct ieee80211_channel_switch *ch_switch)

{

	struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);

drivers/net/wireless/ti/wlcore/main.c

+8 −15
Original line number Diff line number Diff line
@@ -5177,10 +5177,11 @@ static int wl12xx_set_bitrate_mask(struct ieee80211_hw *hw, 
}



static void wl12xx_op_channel_switch(struct ieee80211_hw *hw,

				     struct ieee80211_vif *vif,

				     struct ieee80211_channel_switch *ch_switch)

{

	struct wl1271 *wl = hw->priv;

	struct wl12xx_vif *wlvif;

	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);

	int ret;



	wl1271_debug(DEBUG_MAC80211, "mac80211 channel switch");
@@ -5190,14 +5191,8 @@ static void wl12xx_op_channel_switch(struct ieee80211_hw *hw, 
	mutex_lock(&wl->mutex);



	if (unlikely(wl->state == WLCORE_STATE_OFF)) {

		wl12xx_for_each_wlvif_sta(wl, wlvif) {

			struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);



			if (!test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags))

				continue;



		if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags))

			ieee80211_chswitch_done(vif, false);

		}

		goto out;

	} else if (unlikely(wl->state != WLCORE_STATE_ON)) {

		goto out;
@@ -5208,11 +5203,9 @@ static void wl12xx_op_channel_switch(struct ieee80211_hw *hw, 
		goto out;



	/* TODO: change mac80211 to pass vif as param */

	wl12xx_for_each_wlvif_sta(wl, wlvif) {

		unsigned long delay_usec;



		if (!test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags))

			continue;

	if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) {

		unsigned long delay_usec;



		ret = wl->ops->channel_switch(wl, wlvif, ch_switch);

		if (ret)

include/net/mac80211.h

+1 −0
Original line number Diff line number Diff line
@@ -2969,6 +2969,7 @@ struct ieee80211_ops { 
	void (*flush)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

		      u32 queues, bool drop);

	void (*channel_switch)(struct ieee80211_hw *hw,

			       struct ieee80211_vif *vif,

			       struct ieee80211_channel_switch *ch_switch);

	int (*set_antenna)(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant);

	int (*get_antenna)(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant);