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

Commit bedec3a6 authored by Meenakshi Venkataraman's avatar Meenakshi Venkataraman Committed by Wey-Yi Guy
Browse files

iwlwifi: move iwl_chswitch_done to iwl-mac80211.c 



Move this as part of iwl-core.c cleanup.

Signed-off-by: default avatarMeenakshi Venkataraman <meenakshi.venkataraman@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent aecd44f0

drivers/net/wireless/iwlwifi/iwl-agn.h

+1 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ int iwlagn_suspend(struct iwl_priv *priv, struct cfg80211_wowlan *wowlan); 
/* rx */

int iwlagn_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band);

void iwl_setup_rx_handlers(struct iwl_priv *priv);

void iwl_chswitch_done(struct iwl_priv *priv, bool is_success);





/* tx */

drivers/net/wireless/iwlwifi/iwl-core.c

+0 −15
Original line number Diff line number Diff line
@@ -43,21 +43,6 @@ 


const u8 iwl_bcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };



void iwl_chswitch_done(struct iwl_priv *priv, bool is_success)

{

	/*

	 * MULTI-FIXME

	 * See iwlagn_mac_channel_switch.

	 */

	struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];



	if (test_bit(STATUS_EXIT_PENDING, &priv->status))

		return;



	if (test_and_clear_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status))

		ieee80211_chswitch_done(ctx->vif, is_success);

}



#ifdef CONFIG_IWLWIFI_DEBUG

void iwl_print_rx_config_cmd(struct iwl_priv *priv,

			     enum iwl_rxon_context_id ctxid)

drivers/net/wireless/iwlwifi/iwl-core.h

+0 −5
Original line number Diff line number Diff line
@@ -118,11 +118,6 @@ static inline void iwl_update_stats(struct iwl_priv *priv, bool is_tx, 
}

#endif



/*****************************************************

* RX

******************************************************/

void iwl_chswitch_done(struct iwl_priv *priv, bool is_success);



/*****************************************************

 * TX power

 ****************************************************/

drivers/net/wireless/iwlwifi/iwl-mac80211.c

+15 −0
Original line number Diff line number Diff line
@@ -914,6 +914,21 @@ out: 
	IWL_DEBUG_MAC80211(priv, "leave\n");

}



void iwl_chswitch_done(struct iwl_priv *priv, bool is_success)

{

	/*

	 * MULTI-FIXME

	 * See iwlagn_mac_channel_switch.

	 */

	struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];



	if (test_bit(STATUS_EXIT_PENDING, &priv->status))

		return;



	if (test_and_clear_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status))

		ieee80211_chswitch_done(ctx->vif, is_success);

}



static void iwlagn_configure_filter(struct ieee80211_hw *hw,

				    unsigned int changed_flags,

				    unsigned int *total_flags,