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

Commit facd982e authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlwifi: move iwl_toggle_rx_ant to agn 



The iwl_toggle_tx_ant function is only used
by agn code, so it can be moved into the
agn module instead of being exported from
the core.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 635b85b4

drivers/net/wireless/iwlwifi/iwl-agn-lib.c

+17 −0
Original line number Diff line number Diff line
@@ -2205,3 +2205,20 @@ void iwlagn_set_rxon_chain(struct iwl_priv *priv, struct iwl_rxon_context *ctx) 
	WARN_ON(active_rx_cnt == 0 || idle_rx_cnt == 0 ||

		active_rx_cnt < idle_rx_cnt);

}



u8 iwl_toggle_tx_ant(struct iwl_priv *priv, u8 ant, u8 valid)

{

	int i;

	u8 ind = ant;



	if (priv->band == IEEE80211_BAND_2GHZ &&

	    priv->bt_traffic_load >= IWL_BT_COEX_TRAFFIC_LOAD_HIGH)

		return 0;



	for (i = 0; i < RATE_ANT_NUM - 1; i++) {

		ind = (ind + 1) < RATE_ANT_NUM ?  ind + 1 : 0;

		if (valid & BIT(ind))

			return ind;

	}

	return ant;

}

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

+2 −0
Original line number Diff line number Diff line
@@ -216,6 +216,8 @@ static inline bool iwl_is_tx_success(u32 status) 
	       (status == TX_STATUS_DIRECT_DONE);

}



u8 iwl_toggle_tx_ant(struct iwl_priv *priv, u8 ant_idx, u8 valid);



/* rx */

void iwl_rx_missed_beacon_notif(struct iwl_priv *priv,

				struct iwl_rx_mem_buffer *rxb);

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

+0 −18
Original line number Diff line number Diff line
@@ -72,24 +72,6 @@ MODULE_PARM_DESC(bt_coex_active, "enable wifi/bluetooth co-exist"); 
u32 iwl_debug_level;

EXPORT_SYMBOL(iwl_debug_level);



u8 iwl_toggle_tx_ant(struct iwl_priv *priv, u8 ant, u8 valid)

{

	int i;

	u8 ind = ant;



	if (priv->band == IEEE80211_BAND_2GHZ &&

	    priv->bt_traffic_load >= IWL_BT_COEX_TRAFFIC_LOAD_HIGH)

		return 0;



	for (i = 0; i < RATE_ANT_NUM - 1; i++) {

		ind = (ind + 1) < RATE_ANT_NUM ?  ind + 1 : 0;

		if (valid & BIT(ind))

			return ind;

	}

	return ant;

}

EXPORT_SYMBOL(iwl_toggle_tx_ant);



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

EXPORT_SYMBOL(iwl_bcast_addr);

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

+0 −2
Original line number Diff line number Diff line
@@ -550,8 +550,6 @@ int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force); 
u8 iwl_rate_get_lowest_plcp(struct iwl_priv *priv,

			    struct iwl_rxon_context *ctx);



u8 iwl_toggle_tx_ant(struct iwl_priv *priv, u8 ant_idx, u8 valid);



static inline u32 iwl_ant_idx_to_flags(u8 ant_idx)

{

	return BIT(ant_idx) << RATE_MCS_ANT_POS;