mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
mwl8k: add 5 GHz band channels and rates
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
1349ad2f06
commit
4eae9edd38
1 changed files with 41 additions and 0 deletions
|
@ -144,6 +144,9 @@ struct mwl8k_priv {
|
||||||
struct ieee80211_supported_band band_24;
|
struct ieee80211_supported_band band_24;
|
||||||
struct ieee80211_channel channels_24[14];
|
struct ieee80211_channel channels_24[14];
|
||||||
struct ieee80211_rate rates_24[14];
|
struct ieee80211_rate rates_24[14];
|
||||||
|
struct ieee80211_supported_band band_50;
|
||||||
|
struct ieee80211_channel channels_50[4];
|
||||||
|
struct ieee80211_rate rates_50[9];
|
||||||
|
|
||||||
/* firmware access */
|
/* firmware access */
|
||||||
struct mutex fw_mutex;
|
struct mutex fw_mutex;
|
||||||
|
@ -252,6 +255,25 @@ static const struct ieee80211_rate mwl8k_rates_24[] = {
|
||||||
{ .bitrate = 720, .hw_value = 144, },
|
{ .bitrate = 720, .hw_value = 144, },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static const struct ieee80211_channel mwl8k_channels_50[] = {
|
||||||
|
{ .center_freq = 5180, .hw_value = 36, },
|
||||||
|
{ .center_freq = 5200, .hw_value = 40, },
|
||||||
|
{ .center_freq = 5220, .hw_value = 44, },
|
||||||
|
{ .center_freq = 5240, .hw_value = 48, },
|
||||||
|
};
|
||||||
|
|
||||||
|
static const struct ieee80211_rate mwl8k_rates_50[] = {
|
||||||
|
{ .bitrate = 60, .hw_value = 12, },
|
||||||
|
{ .bitrate = 90, .hw_value = 18, },
|
||||||
|
{ .bitrate = 120, .hw_value = 24, },
|
||||||
|
{ .bitrate = 180, .hw_value = 36, },
|
||||||
|
{ .bitrate = 240, .hw_value = 48, },
|
||||||
|
{ .bitrate = 360, .hw_value = 72, },
|
||||||
|
{ .bitrate = 480, .hw_value = 96, },
|
||||||
|
{ .bitrate = 540, .hw_value = 108, },
|
||||||
|
{ .bitrate = 720, .hw_value = 144, },
|
||||||
|
};
|
||||||
|
|
||||||
/* Set or get info from Firmware */
|
/* Set or get info from Firmware */
|
||||||
#define MWL8K_CMD_SET 0x0001
|
#define MWL8K_CMD_SET 0x0001
|
||||||
#define MWL8K_CMD_GET 0x0000
|
#define MWL8K_CMD_GET 0x0000
|
||||||
|
@ -1579,6 +1601,25 @@ static void mwl8k_setup_2ghz_band(struct ieee80211_hw *hw)
|
||||||
hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &priv->band_24;
|
hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &priv->band_24;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void mwl8k_setup_5ghz_band(struct ieee80211_hw *hw)
|
||||||
|
{
|
||||||
|
struct mwl8k_priv *priv = hw->priv;
|
||||||
|
|
||||||
|
BUILD_BUG_ON(sizeof(priv->channels_50) != sizeof(mwl8k_channels_50));
|
||||||
|
memcpy(priv->channels_50, mwl8k_channels_50, sizeof(mwl8k_channels_50));
|
||||||
|
|
||||||
|
BUILD_BUG_ON(sizeof(priv->rates_50) != sizeof(mwl8k_rates_50));
|
||||||
|
memcpy(priv->rates_50, mwl8k_rates_50, sizeof(mwl8k_rates_50));
|
||||||
|
|
||||||
|
priv->band_50.band = IEEE80211_BAND_5GHZ;
|
||||||
|
priv->band_50.channels = priv->channels_50;
|
||||||
|
priv->band_50.n_channels = ARRAY_SIZE(mwl8k_channels_50);
|
||||||
|
priv->band_50.bitrates = priv->rates_50;
|
||||||
|
priv->band_50.n_bitrates = ARRAY_SIZE(mwl8k_rates_50);
|
||||||
|
|
||||||
|
hw->wiphy->bands[IEEE80211_BAND_5GHZ] = &priv->band_50;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* CMD_GET_HW_SPEC (STA version).
|
* CMD_GET_HW_SPEC (STA version).
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in a new issue