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

Commit ef33417d authored by John W. Linville's avatar John W. Linville
Browse files

iwlegacy: change some symbols duplicated from iwlwifi directory 



drivers/net/wireless/iwlegacy/built-in.o:(.rodata+0x29f0): multiple definition of `iwl_rates'
drivers/net/wireless/iwlwifi/built-in.o:(.rodata+0xa68): first defined here
powerpc64-linux-ld: Warning: size of symbol `iwl_rates' changed from 143 in drivers/net/wireless/iwlwifi/built-in.o to 130 in drivers/net/wireless/iwlegacy/built-in.o
drivers/net/wireless/iwlegacy/built-in.o:(.data+0x0): multiple definition of `bt_coex_active'
drivers/net/wireless/iwlwifi/built-in.o:(.data+0x668): first defined here
drivers/net/wireless/iwlegacy/built-in.o:(.rodata+0x750): multiple definition of `iwl_eeprom_band_1'
drivers/net/wireless/iwlwifi/built-in.o:(.rodata+0x27d0): first defined here
drivers/net/wireless/iwlegacy/built-in.o:(.rodata+0x3f0): multiple definition of `iwl_bcast_addr'
drivers/net/wireless/iwlwifi/built-in.o:(.rodata+0x24f8): first defined here
drivers/net/wireless/iwlegacy/built-in.o:(.bss+0x3d48): multiple definition of `iwl_debug_level'
drivers/net/wireless/iwlwifi/built-in.o:(.bss+0x21950): first defined here

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5f16a436

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

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

			band_offset = IWL_FIRST_OFDM_RATE;

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

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

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

				return idx - band_offset;

	}
@@ -995,7 +995,7 @@ int iwl4965_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) 
		/* use bcast addr, will not be transmitted but must be valid */

		cmd_len = iwl_legacy_fill_probe_req(priv,

					(struct ieee80211_mgmt *)scan->data,

					iwl_bcast_addr, NULL, 0,

					iwlegacy_bcast_addr, NULL, 0,

					IWL_MAX_SCAN_SIZE - sizeof(*scan));



	}

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

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

 *

 */

const struct iwl_rate_info iwl_rates[IWL_RATE_COUNT] = {

const struct iwl_rate_info iwlegacy_rates[IWL_RATE_COUNT] = {

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

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

	IWL_DECLARE_RATE_INFO(5, INV, 2, 6, 2, 11, 2, 11),        /*5.5mbps */
@@ -133,8 +133,8 @@ static int iwl4965_hwrate_to_plcp_idx(u32 rate_n_flags) 


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

	} else {

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

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

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

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

				return idx;

	}
@@ -500,7 +500,7 @@ static u32 iwl4965_rate_n_flags_from_tbl(struct iwl_priv *priv, 
	u32 rate_n_flags = 0;



	if (is_legacy(tbl->lq_type)) {

		rate_n_flags = iwl_rates[index].plcp;

		rate_n_flags = iwlegacy_rates[index].plcp;

		if (index >= IWL_FIRST_CCK_RATE && index <= IWL_LAST_CCK_RATE)

			rate_n_flags |= RATE_MCS_CCK_MSK;
@@ -512,9 +512,9 @@ static u32 iwl4965_rate_n_flags_from_tbl(struct iwl_priv *priv, 
		rate_n_flags = RATE_MCS_HT_MSK;



		if (is_siso(tbl->lq_type))

			rate_n_flags |=	iwl_rates[index].plcp_siso;

			rate_n_flags |=	iwlegacy_rates[index].plcp_siso;

		else

			rate_n_flags |=	iwl_rates[index].plcp_mimo2;

			rate_n_flags |=	iwlegacy_rates[index].plcp_mimo2;

	} else {

		IWL_ERR(priv, "Invalid tbl->lq_type %d\n", tbl->lq_type);

	}
@@ -703,7 +703,7 @@ iwl4965_rs_get_adjacent_rate(struct iwl_priv *priv, u8 index, u16 rate_mask, 


	low = index;

	while (low != IWL_RATE_INVALID) {

		low = iwl_rates[low].prev_rs;

		low = iwlegacy_rates[low].prev_rs;

		if (low == IWL_RATE_INVALID)

			break;

		if (rate_mask & (1 << low))
@@ -713,7 +713,7 @@ iwl4965_rs_get_adjacent_rate(struct iwl_priv *priv, u8 index, u16 rate_mask, 


	high = index;

	while (high != IWL_RATE_INVALID) {

		high = iwl_rates[high].next_rs;

		high = iwlegacy_rates[high].next_rs;

		if (high == IWL_RATE_INVALID)

			break;

		if (rate_mask & (1 << high))
@@ -2221,7 +2221,7 @@ static void iwl4965_rs_initialize_lq(struct iwl_priv *priv, 
	if ((i < 0) || (i >= IWL_RATE_COUNT))

		i = 0;



	rate = iwl_rates[i].plcp;

	rate = iwlegacy_rates[i].plcp;

	tbl->ant_type = iwl4965_first_antenna(valid_tx_ant);

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

		desc += sprintf(buff+desc,

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

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

				iwlegacy_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

+3 −2
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ iwl4965_sta_alloc_lq(struct iwl_priv *priv, u8 sta_id) 


	rate_flags |= iwl4965_first_antenna(priv->hw_params.valid_tx_ant) <<

				RATE_MCS_ANT_POS;

	rate_n_flags = iwl4965_hw_set_rate_n_flags(iwl_rates[r].plcp, rate_flags);

	rate_n_flags = iwl4965_hw_set_rate_n_flags(iwlegacy_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;
@@ -553,7 +554,7 @@ int iwl4965_alloc_bcast_station(struct iwl_priv *priv, 
	u8 sta_id;



	spin_lock_irqsave(&priv->sta_lock, flags);

	sta_id = iwl_legacy_prep_station(priv, ctx, iwl_bcast_addr,

	sta_id = iwl_legacy_prep_station(priv, ctx, iwlegacy_bcast_addr,

								false, NULL);

	if (sta_id == IWL_INVALID_STATION) {

		IWL_ERR(priv, "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 iwl4965_tx_cmd_build_rate(struct iwl_priv *priv, 
	if (info->band == IEEE80211_BAND_5GHZ)

		rate_idx += IWL_FIRST_OFDM_RATE;

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

	rate_plcp = iwl_rates[rate_idx].plcp;

	rate_plcp = iwlegacy_rates[rate_idx].plcp;

	/* Zero out flags for this packet */

	rate_flags = 0;

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

+10 −11
Original line number Diff line number Diff line
@@ -64,16 +64,15 @@ MODULE_LICENSE("GPL"); 
 *

 * default: bt_coex_active = true (BT_COEX_ENABLE)

 */

bool bt_coex_active = true;

EXPORT_SYMBOL_GPL(bt_coex_active);

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 iwl_debug_level;

EXPORT_SYMBOL(iwl_debug_level);

u32 iwlegacy_debug_level;

EXPORT_SYMBOL(iwlegacy_debug_level);



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

EXPORT_SYMBOL(iwl_bcast_addr);

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

EXPORT_SYMBOL(iwlegacy_bcast_addr);





/* This function both allocates and initializes hw and priv. */
@@ -183,7 +182,7 @@ int iwl_legacy_init_geos(struct iwl_priv *priv) 


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

	sband = &priv->bands[IEEE80211_BAND_5GHZ];

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

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

	/* just OFDM */

	sband->bitrates = &rates[IWL_FIRST_OFDM_RATE];

	sband->n_bitrates = IWL_RATE_COUNT_LEGACY - IWL_FIRST_OFDM_RATE;
@@ -1489,7 +1488,7 @@ int iwl_legacy_alloc_traffic_mem(struct iwl_priv *priv) 
{

	u32 traffic_size = IWL_TRAFFIC_DUMP_SIZE;



	if (iwl_debug_level & IWL_DL_TX) {

	if (iwlegacy_debug_level & IWL_DL_TX) {

		if (!priv->tx_traffic) {

			priv->tx_traffic =

				kzalloc(traffic_size, GFP_KERNEL);
@@ -1497,7 +1496,7 @@ int iwl_legacy_alloc_traffic_mem(struct iwl_priv *priv) 
				return -ENOMEM;

		}

	}

	if (iwl_debug_level & IWL_DL_RX) {

	if (iwlegacy_debug_level & IWL_DL_RX) {

		if (!priv->rx_traffic) {

			priv->rx_traffic =

				kzalloc(traffic_size, GFP_KERNEL);
@@ -1526,7 +1525,7 @@ void iwl_legacy_dbg_log_tx_data_frame(struct iwl_priv *priv, 
	__le16 fc;

	u16 len;



	if (likely(!(iwl_debug_level & IWL_DL_TX)))

	if (likely(!(iwlegacy_debug_level & IWL_DL_TX)))

		return;



	if (!priv->tx_traffic)
@@ -1551,7 +1550,7 @@ void iwl_legacy_dbg_log_rx_data_frame(struct iwl_priv *priv, 
	__le16 fc;

	u16 len;



	if (likely(!(iwl_debug_level & IWL_DL_RX)))

	if (likely(!(iwlegacy_debug_level & IWL_DL_RX)))

		return;



	if (!priv->rx_traffic)