diff options
| author | Stanislaw Gruszka | 2012-02-03 17:31:52 +0100 |
|---|---|---|
| committer | John W. Linville | 2012-02-06 20:56:07 +0100 |
| commit | 1c03c4620edc551b5bbcc87c7aca02b482d8bc51 (patch) | |
| tree | 748ed469ac864e906a4b70c2173ff5d4e76a84a1 /drivers/net/wireless/iwlegacy/4965-mac.c | |
| parent | iwlegacy: move qos_data out of ctx structure (diff) | |
| download | kernel-qcow2-linux-1c03c4620edc551b5bbcc87c7aca02b482d8bc51.tar.gz kernel-qcow2-linux-1c03c4620edc551b5bbcc87c7aca02b482d8bc51.tar.xz kernel-qcow2-linux-1c03c4620edc551b5bbcc87c7aca02b482d8bc51.zip | |
iwlegacy: move ht out of ctx structure
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/4965-mac.c')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/4965-mac.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c index 1dd001475522..94984c850e84 100644 --- a/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/iwlegacy/4965-mac.c @@ -5793,23 +5793,23 @@ il4965_mac_channel_switch(struct ieee80211_hw *hw, il->current_ht_config.smps = conf->smps_mode; /* Configure HT40 channels */ - ctx->ht.enabled = conf_is_ht(conf); - if (ctx->ht.enabled) { + il->ht.enabled = conf_is_ht(conf); + if (il->ht.enabled) { if (conf_is_ht40_minus(conf)) { - ctx->ht.extension_chan_offset = + il->ht.extension_chan_offset = IEEE80211_HT_PARAM_CHA_SEC_BELOW; - ctx->ht.is_40mhz = true; + il->ht.is_40mhz = true; } else if (conf_is_ht40_plus(conf)) { - ctx->ht.extension_chan_offset = + il->ht.extension_chan_offset = IEEE80211_HT_PARAM_CHA_SEC_ABOVE; - ctx->ht.is_40mhz = true; + il->ht.is_40mhz = true; } else { - ctx->ht.extension_chan_offset = + il->ht.extension_chan_offset = IEEE80211_HT_PARAM_CHA_SEC_NONE; - ctx->ht.is_40mhz = false; + il->ht.is_40mhz = false; } } else - ctx->ht.is_40mhz = false; + il->ht.is_40mhz = false; if ((le16_to_cpu(il->staging.channel) != ch)) il->staging.flags = 0; |