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

Commit d2ddf621 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka
Browse files

iwlegacy: rename iwlegacy to il 



More renaming to make code shorter.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
parent 46bc8d4b

drivers/net/wireless/iwlegacy/iwl-4965-lib.c

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ int il4965_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band) 
		if (band == IEEE80211_BAND_5GHZ)

			band_offset = IL_FIRST_OFDM_RATE;

		for (idx = band_offset; idx < IL_RATE_COUNT_LEGACY; idx++)

			if (iwlegacy_rates[idx].plcp == (rate_n_flags & 0xFF))

			if (il_rates[idx].plcp == (rate_n_flags & 0xFF))

				return idx - band_offset;

	}

drivers/net/wireless/iwlegacy/iwl-4965-rs.c

+10 −10
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static const u8 ant_toggle_lookup[] = { 
 * maps to IL_RATE_INVALID

 *

 */

const struct il_rate_info iwlegacy_rates[IL_RATE_COUNT] = {

const struct il_rate_info il_rates[IL_RATE_COUNT] = {

	IL_DECLARE_RATE_INFO(1, INV, INV, 2, INV, 2, INV, 2),    /*  1mbps */

	IL_DECLARE_RATE_INFO(2, INV, 1, 5, 1, 5, 1, 5),          /*  2mbps */

	IL_DECLARE_RATE_INFO(5, INV, 2, 6, 2, 11, 2, 11),        /*5.5mbps */
@@ -132,8 +132,8 @@ static int il4965_hwrate_to_plcp_idx(u32 rate_n_flags) 


	/* legacy rate format, search for match in table */

	} else {

		for (idx = 0; idx < ARRAY_SIZE(iwlegacy_rates); idx++)

			if (iwlegacy_rates[idx].plcp == (rate_n_flags & 0xFF))

		for (idx = 0; idx < ARRAY_SIZE(il_rates); idx++)

			if (il_rates[idx].plcp == (rate_n_flags & 0xFF))

				return idx;

	}
@@ -499,7 +499,7 @@ static u32 il4965_rate_n_flags_from_tbl(struct il_priv *il, 
	u32 rate_n_flags = 0;



	if (is_legacy(tbl->lq_type)) {

		rate_n_flags = iwlegacy_rates[index].plcp;

		rate_n_flags = il_rates[index].plcp;

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

			rate_n_flags |= RATE_MCS_CCK_MSK;
@@ -511,9 +511,9 @@ static u32 il4965_rate_n_flags_from_tbl(struct il_priv *il, 
		rate_n_flags = RATE_MCS_HT_MSK;



		if (is_siso(tbl->lq_type))

			rate_n_flags |=	iwlegacy_rates[index].plcp_siso;

			rate_n_flags |=	il_rates[index].plcp_siso;

		else

			rate_n_flags |=	iwlegacy_rates[index].plcp_mimo2;

			rate_n_flags |=	il_rates[index].plcp_mimo2;

	} else {

		IL_ERR(il, "Invalid tbl->lq_type %d\n", tbl->lq_type);

	}
@@ -702,7 +702,7 @@ il4965_rs_get_adjacent_rate(struct il_priv *il, u8 index, u16 rate_mask, 


	low = index;

	while (low != IL_RATE_INVALID) {

		low = iwlegacy_rates[low].prev_rs;

		low = il_rates[low].prev_rs;

		if (low == IL_RATE_INVALID)

			break;

		if (rate_mask & (1 << low))
@@ -712,7 +712,7 @@ il4965_rs_get_adjacent_rate(struct il_priv *il, u8 index, u16 rate_mask, 


	high = index;

	while (high != IL_RATE_INVALID) {

		high = iwlegacy_rates[high].next_rs;

		high = il_rates[high].next_rs;

		if (high == IL_RATE_INVALID)

			break;

		if (rate_mask & (1 << high))
@@ -2220,7 +2220,7 @@ static void il4965_rs_initialize_lq(struct il_priv *il, 
	if ((i < 0) || (i >= IL_RATE_COUNT))

		i = 0;



	rate = iwlegacy_rates[i].plcp;

	rate = il_rates[i].plcp;

	tbl->ant_type = il4965_first_antenna(valid_tx_ant);

	rate |= tbl->ant_type << RATE_MCS_ANT_POS;
@@ -2793,7 +2793,7 @@ static ssize_t il4965_rs_sta_dbgfs_rate_scale_data_read(struct file *file, 
	else

		desc += sprintf(buff+desc,

				"Bit Rate= %d Mb/s\n",

				iwlegacy_rates[lq_sta->last_txrate_idx].ieee >> 1);

				il_rates[lq_sta->last_txrate_idx].ieee >> 1);



	ret = simple_read_from_buffer(user_buf, count, ppos, buff, desc);

	return ret;

drivers/net/wireless/iwlegacy/iwl-4965-sta.c

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ il4965_sta_alloc_lq(struct il_priv *il, u8 sta_id) 


	rate_flags |= il4965_first_antenna(il->hw_params.valid_tx_ant) <<

				RATE_MCS_ANT_POS;

	rate_n_flags = il4965_hw_set_rate_n_flags(iwlegacy_rates[r].plcp,

	rate_n_flags = il4965_hw_set_rate_n_flags(il_rates[r].plcp,

						   rate_flags);

	for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++)

		link_cmd->rs_table[i].rate_n_flags = rate_n_flags;
@@ -554,7 +554,7 @@ int il4965_alloc_bcast_station(struct il_priv *il, 
	u8 sta_id;



	spin_lock_irqsave(&il->sta_lock, flags);

	sta_id = il_prep_station(il, ctx, iwlegacy_bcast_addr,

	sta_id = il_prep_station(il, ctx, il_bcast_addr,

								false, NULL);

	if (sta_id == IL_INVALID_STATION) {

		IL_ERR(il, "Unable to prepare broadcast station\n");

drivers/net/wireless/iwlegacy/iwl-4965-tx.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static void il4965_tx_cmd_build_rate(struct il_priv *il, 
	if (info->band == IEEE80211_BAND_5GHZ)

		rate_idx += IL_FIRST_OFDM_RATE;

	/* Get PLCP rate for tx_cmd->rate_n_flags */

	rate_plcp = iwlegacy_rates[rate_idx].plcp;

	rate_plcp = il_rates[rate_idx].plcp;

	/* Zero out flags for this packet */

	rate_flags = 0;

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

+9 −9
Original line number Diff line number Diff line
@@ -68,11 +68,11 @@ static bool bt_coex_active = true; 
module_param(bt_coex_active, bool, S_IRUGO);

MODULE_PARM_DESC(bt_coex_active, "enable wifi/bluetooth co-exist");



u32 iwlegacy_debug_level;

EXPORT_SYMBOL(iwlegacy_debug_level);

u32 il_debug_level;

EXPORT_SYMBOL(il_debug_level);



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

EXPORT_SYMBOL(iwlegacy_bcast_addr);

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

EXPORT_SYMBOL(il_bcast_addr);





/* This function both allocates and initializes hw and il. */
@@ -183,7 +183,7 @@ int il_init_geos(struct il_priv *il) 


	/* 5.2GHz channels start after the 2.4GHz channels */

	sband = &il->bands[IEEE80211_BAND_5GHZ];

	sband->channels = &channels[ARRAY_SIZE(iwlegacy_eeprom_band_1)];

	sband->channels = &channels[ARRAY_SIZE(il_eeprom_band_1)];

	/* just OFDM */

	sband->bitrates = &rates[IL_FIRST_OFDM_RATE];

	sband->n_bitrates = IL_RATE_COUNT_LEGACY - IL_FIRST_OFDM_RATE;
@@ -1486,7 +1486,7 @@ int il_alloc_traffic_mem(struct il_priv *il) 
{

	u32 traffic_size = IL_TRAFFIC_DUMP_SIZE;



	if (iwlegacy_debug_level & IL_DL_TX) {

	if (il_debug_level & IL_DL_TX) {

		if (!il->tx_traffic) {

			il->tx_traffic =

				kzalloc(traffic_size, GFP_KERNEL);
@@ -1494,7 +1494,7 @@ int il_alloc_traffic_mem(struct il_priv *il) 
				return -ENOMEM;

		}

	}

	if (iwlegacy_debug_level & IL_DL_RX) {

	if (il_debug_level & IL_DL_RX) {

		if (!il->rx_traffic) {

			il->rx_traffic =

				kzalloc(traffic_size, GFP_KERNEL);
@@ -1523,7 +1523,7 @@ void il_dbg_log_tx_data_frame(struct il_priv *il, 
	__le16 fc;

	u16 len;



	if (likely(!(iwlegacy_debug_level & IL_DL_TX)))

	if (likely(!(il_debug_level & IL_DL_TX)))

		return;



	if (!il->tx_traffic)
@@ -1548,7 +1548,7 @@ void il_dbg_log_rx_data_frame(struct il_priv *il, 
	__le16 fc;

	u16 len;



	if (likely(!(iwlegacy_debug_level & IL_DL_RX)))

	if (likely(!(il_debug_level & IL_DL_RX)))

		return;



	if (!il->rx_traffic)