Commit 13f71050 authored by Oleksij Rempel's avatar Oleksij Rempel Committed by John W. Linville
Browse files

ath9k: move ath9k_init_channels_rates to common-init 



and rename it to ath9k_cmn_init_channels_rates.
sbands are move to ath_common as well.

Signed-off-by: default avatarOleksij Rempel <linux@rempel-privat.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 031eb464

drivers/net/wireless/ath/ath.h

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ struct ath_common { 
	bool bt_ant_diversity;



	int last_rssi;

	struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];

};



struct sk_buff *ath_rxbuf_alloc(struct ath_common *common,

drivers/net/wireless/ath/ath9k/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ ath9k_hw-$(CONFIG_ATH9K_BTCOEX_SUPPORT) += btcoex.o \ 
obj-$(CONFIG_ATH9K_HW) += ath9k_hw.o



obj-$(CONFIG_ATH9K_COMMON) += ath9k_common.o

ath9k_common-y:=	common.o

ath9k_common-y:=	common.o \

			common-init.o



ath9k_htc-y +=	htc_hst.o \

		hif_usb.o \

drivers/net/wireless/ath/ath9k/ath9k.h

+0 −1
Original line number Diff line number Diff line
@@ -753,7 +753,6 @@ struct ath_softc { 
	struct ath_rx rx;

	struct ath_tx tx;

	struct ath_beacon beacon;

	struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];



#ifdef CONFIG_MAC80211_LEDS

	bool led_registered;

drivers/net/wireless/ath/ath9k/beacon.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static void ath9k_beacon_setup(struct ath_softc *sc, struct ieee80211_vif *vif, 
	u8 chainmask = ah->txchainmask;

	u8 rate = 0;



	sband = &sc->sbands[common->hw->conf.chandef.chan->band];

	sband = &common->sbands[common->hw->conf.chandef.chan->band];

	rate = sband->bitrates[rateidx].hw_value;

	if (vif->bss_conf.use_short_preamble)

		rate |= sband->bitrates[rateidx].hw_value_short;

drivers/net/wireless/ath/ath9k/common-init.c

0 → 100644
+170 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2008-2011 Atheros Communications Inc.

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



/* We use the hw_value as an index into our private channel structure */



#include "common.h"



#define CHAN2G(_freq, _idx)  { \

	.band = IEEE80211_BAND_2GHZ, \

	.center_freq = (_freq), \

	.hw_value = (_idx), \

	.max_power = 20, \

}



#define CHAN5G(_freq, _idx) { \

	.band = IEEE80211_BAND_5GHZ, \

	.center_freq = (_freq), \

	.hw_value = (_idx), \

	.max_power = 20, \

}



/* Some 2 GHz radios are actually tunable on 2312-2732

 * on 5 MHz steps, we support the channels which we know

 * we have calibration data for all cards though to make

 * this static */

static const struct ieee80211_channel ath9k_2ghz_chantable[] = {

	CHAN2G(2412, 0), /* Channel 1 */

	CHAN2G(2417, 1), /* Channel 2 */

	CHAN2G(2422, 2), /* Channel 3 */

	CHAN2G(2427, 3), /* Channel 4 */

	CHAN2G(2432, 4), /* Channel 5 */

	CHAN2G(2437, 5), /* Channel 6 */

	CHAN2G(2442, 6), /* Channel 7 */

	CHAN2G(2447, 7), /* Channel 8 */

	CHAN2G(2452, 8), /* Channel 9 */

	CHAN2G(2457, 9), /* Channel 10 */

	CHAN2G(2462, 10), /* Channel 11 */

	CHAN2G(2467, 11), /* Channel 12 */

	CHAN2G(2472, 12), /* Channel 13 */

	CHAN2G(2484, 13), /* Channel 14 */

};



/* Some 5 GHz radios are actually tunable on XXXX-YYYY

 * on 5 MHz steps, we support the channels which we know

 * we have calibration data for all cards though to make

 * this static */

static const struct ieee80211_channel ath9k_5ghz_chantable[] = {

	/* _We_ call this UNII 1 */

	CHAN5G(5180, 14), /* Channel 36 */

	CHAN5G(5200, 15), /* Channel 40 */

	CHAN5G(5220, 16), /* Channel 44 */

	CHAN5G(5240, 17), /* Channel 48 */

	/* _We_ call this UNII 2 */

	CHAN5G(5260, 18), /* Channel 52 */

	CHAN5G(5280, 19), /* Channel 56 */

	CHAN5G(5300, 20), /* Channel 60 */

	CHAN5G(5320, 21), /* Channel 64 */

	/* _We_ call this "Middle band" */

	CHAN5G(5500, 22), /* Channel 100 */

	CHAN5G(5520, 23), /* Channel 104 */

	CHAN5G(5540, 24), /* Channel 108 */

	CHAN5G(5560, 25), /* Channel 112 */

	CHAN5G(5580, 26), /* Channel 116 */

	CHAN5G(5600, 27), /* Channel 120 */

	CHAN5G(5620, 28), /* Channel 124 */

	CHAN5G(5640, 29), /* Channel 128 */

	CHAN5G(5660, 30), /* Channel 132 */

	CHAN5G(5680, 31), /* Channel 136 */

	CHAN5G(5700, 32), /* Channel 140 */

	/* _We_ call this UNII 3 */

	CHAN5G(5745, 33), /* Channel 149 */

	CHAN5G(5765, 34), /* Channel 153 */

	CHAN5G(5785, 35), /* Channel 157 */

	CHAN5G(5805, 36), /* Channel 161 */

	CHAN5G(5825, 37), /* Channel 165 */

};



/* Atheros hardware rate code addition for short premble */

#define SHPCHECK(__hw_rate, __flags) \

	((__flags & IEEE80211_RATE_SHORT_PREAMBLE) ? (__hw_rate | 0x04 ) : 0)



#define RATE(_bitrate, _hw_rate, _flags) {              \

	.bitrate        = (_bitrate),                   \

	.flags          = (_flags),                     \

	.hw_value       = (_hw_rate),                   \

	.hw_value_short = (SHPCHECK(_hw_rate, _flags))  \

}



static struct ieee80211_rate ath9k_legacy_rates[] = {

	RATE(10, 0x1b, 0),

	RATE(20, 0x1a, IEEE80211_RATE_SHORT_PREAMBLE),

	RATE(55, 0x19, IEEE80211_RATE_SHORT_PREAMBLE),

	RATE(110, 0x18, IEEE80211_RATE_SHORT_PREAMBLE),

	RATE(60, 0x0b, (IEEE80211_RATE_SUPPORTS_5MHZ |

			IEEE80211_RATE_SUPPORTS_10MHZ)),

	RATE(90, 0x0f, (IEEE80211_RATE_SUPPORTS_5MHZ |

			IEEE80211_RATE_SUPPORTS_10MHZ)),

	RATE(120, 0x0a, (IEEE80211_RATE_SUPPORTS_5MHZ |

			 IEEE80211_RATE_SUPPORTS_10MHZ)),

	RATE(180, 0x0e, (IEEE80211_RATE_SUPPORTS_5MHZ |

			 IEEE80211_RATE_SUPPORTS_10MHZ)),

	RATE(240, 0x09, (IEEE80211_RATE_SUPPORTS_5MHZ |

			 IEEE80211_RATE_SUPPORTS_10MHZ)),

	RATE(360, 0x0d, (IEEE80211_RATE_SUPPORTS_5MHZ |

			 IEEE80211_RATE_SUPPORTS_10MHZ)),

	RATE(480, 0x08, (IEEE80211_RATE_SUPPORTS_5MHZ |

			 IEEE80211_RATE_SUPPORTS_10MHZ)),

	RATE(540, 0x0c, (IEEE80211_RATE_SUPPORTS_5MHZ |

			 IEEE80211_RATE_SUPPORTS_10MHZ)),

};



int ath9k_cmn_init_channels_rates(struct ath_common *common)

{

	struct ath_hw *ah = (struct ath_hw *)common->ah;

	void *channels;



	BUILD_BUG_ON(ARRAY_SIZE(ath9k_2ghz_chantable) +

		     ARRAY_SIZE(ath9k_5ghz_chantable) !=

		     ATH9K_NUM_CHANNELS);



	if (ah->caps.hw_caps & ATH9K_HW_CAP_2GHZ) {

		channels = devm_kzalloc(ah->dev,

			sizeof(ath9k_2ghz_chantable), GFP_KERNEL);

		if (!channels)

		    return -ENOMEM;



		memcpy(channels, ath9k_2ghz_chantable,

		       sizeof(ath9k_2ghz_chantable));

		common->sbands[IEEE80211_BAND_2GHZ].channels = channels;

		common->sbands[IEEE80211_BAND_2GHZ].band = IEEE80211_BAND_2GHZ;

		common->sbands[IEEE80211_BAND_2GHZ].n_channels =

			ARRAY_SIZE(ath9k_2ghz_chantable);

		common->sbands[IEEE80211_BAND_2GHZ].bitrates = ath9k_legacy_rates;

		common->sbands[IEEE80211_BAND_2GHZ].n_bitrates =

			ARRAY_SIZE(ath9k_legacy_rates);

	}



	if (ah->caps.hw_caps & ATH9K_HW_CAP_5GHZ) {

		channels = devm_kzalloc(ah->dev,

			sizeof(ath9k_5ghz_chantable), GFP_KERNEL);

		if (!channels)

			return -ENOMEM;



		memcpy(channels, ath9k_5ghz_chantable,

		       sizeof(ath9k_5ghz_chantable));

		common->sbands[IEEE80211_BAND_5GHZ].channels = channels;

		common->sbands[IEEE80211_BAND_5GHZ].band = IEEE80211_BAND_5GHZ;

		common->sbands[IEEE80211_BAND_5GHZ].n_channels =

			ARRAY_SIZE(ath9k_5ghz_chantable);

		common->sbands[IEEE80211_BAND_5GHZ].bitrates =

			ath9k_legacy_rates + 4;

		common->sbands[IEEE80211_BAND_5GHZ].n_bitrates =

			ARRAY_SIZE(ath9k_legacy_rates) - 4;

	}

	return 0;

}

EXPORT_SYMBOL(ath9k_cmn_init_channels_rates);