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

Commit a0c1ef3b authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

iwlegacy: 4965: toggle tx antenna inline 



Make function static and change antenna number inline.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 17d4eca6

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

+18 −23
Original line number Diff line number Diff line
@@ -825,6 +825,21 @@ il4965_ant_idx_to_flags(u8 ant_idx) 
	return BIT(ant_idx) << RATE_MCS_ANT_POS;

}



static void

il4965_toggle_tx_ant(struct il_priv *il, u8 *ant, u8 valid)

{

	int i;

	u8 ind = *ant;



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

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

		if (valid & BIT(ind)) {

			*ant = ind;

			return;

		}

	}

}



int

il4965_request_scan(struct il_priv *il, struct ieee80211_vif *vif)

{
@@ -960,8 +975,7 @@ il4965_request_scan(struct il_priv *il, struct ieee80211_vif *vif) 
	if (il->cfg->scan_rx_antennas[band])

		rx_ant = il->cfg->scan_rx_antennas[band];



	il->scan_tx_ant[band] =

	    il4965_toggle_tx_ant(il, il->scan_tx_ant[band], scan_tx_antennas);

	il4965_toggle_tx_ant(il, &il->scan_tx_ant[band], scan_tx_antennas);

	rate_flags |= il4965_ant_idx_to_flags(il->scan_tx_ant[band]);

	scan->tx_cmd.rate_n_flags =

	    il4965_hw_set_rate_n_flags(rate, rate_flags);
@@ -1171,20 +1185,6 @@ il4965_set_rxon_chain(struct il_priv *il, struct il_rxon_context *ctx) 
		active_rx_cnt < idle_rx_cnt);

}



u8

il4965_toggle_tx_ant(struct il_priv *il, u8 ant, u8 valid)

{

	int i;

	u8 ind = ant;



	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;

}



static const char *

il4965_get_fh_string(int cmd)

{
@@ -1588,10 +1588,7 @@ il4965_tx_cmd_build_rate(struct il_priv *il, struct il_tx_cmd *tx_cmd, 
		rate_flags |= RATE_MCS_CCK_MSK;



	/* Set up antennas */

	il->mgmt_tx_ant =

	    il4965_toggle_tx_ant(il, il->mgmt_tx_ant,

				 il->hw_params.valid_tx_ant);



	il4965_toggle_tx_ant(il, &il->mgmt_tx_ant, il->hw_params.valid_tx_ant);

	rate_flags |= il4965_ant_idx_to_flags(il->mgmt_tx_ant);



	/* Set the rate in the TX cmd */
@@ -3540,9 +3537,7 @@ il4965_hw_get_beacon_cmd(struct il_priv *il, struct il_frame *frame) 


	/* Set up packet rate and flags */

	rate = il_get_lowest_plcp(il, il->beacon_ctx);

	il->mgmt_tx_ant =

	    il4965_toggle_tx_ant(il, il->mgmt_tx_ant,

				 il->hw_params.valid_tx_ant);

	il4965_toggle_tx_ant(il, &il->mgmt_tx_ant, il->hw_params.valid_tx_ant);

	rate_flags = il4965_ant_idx_to_flags(il->mgmt_tx_ant);

	if ((rate >= IL_FIRST_CCK_RATE) && (rate <= IL_LAST_CCK_RATE))

		rate_flags |= RATE_MCS_CCK_MSK;

drivers/net/wireless/iwlegacy/4965.h

+0 −2
Original line number Diff line number Diff line
@@ -107,8 +107,6 @@ void il4965_set_wr_ptrs(struct il_priv *il, int txq_id, u32 idx); 
void il4965_tx_queue_set_status(struct il_priv *il, struct il_tx_queue *txq,

				int tx_fifo_id, int scd_retry);



u8 il4965_toggle_tx_ant(struct il_priv *il, u8 ant_idx, u8 valid);



/* rx */

void il4965_hdl_missed_beacon(struct il_priv *il, struct il_rx_buf *rxb);

bool il4965_good_plcp_health(struct il_priv *il, struct il_rx_pkt *pkt);