diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2012-02-03 11:31:52 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-02-06 14:56:07 -0500 |
commit | 1c03c4620edc551b5bbcc87c7aca02b482d8bc51 (patch) | |
tree | 748ed469ac864e906a4b70c2173ff5d4e76a84a1 /drivers/net/wireless/iwlegacy/common.h | |
parent | 8d44f2bd7554734913f1256e4f45c35454167161 (diff) |
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/common.h')
-rw-r--r-- | drivers/net/wireless/iwlegacy/common.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h index 18375cb7904c..df4d1602289c 100644 --- a/drivers/net/wireless/iwlegacy/common.h +++ b/drivers/net/wireless/iwlegacy/common.h | |||
@@ -1164,13 +1164,6 @@ struct il_rxon_context { | |||
1164 | * we already removed the vif for type setting. | 1164 | * we already removed the vif for type setting. |
1165 | */ | 1165 | */ |
1166 | bool always_active, is_active; | 1166 | bool always_active, is_active; |
1167 | |||
1168 | struct { | ||
1169 | bool non_gf_sta_present; | ||
1170 | u8 protection; | ||
1171 | bool enabled, is_40mhz; | ||
1172 | u8 extension_chan_offset; | ||
1173 | } ht; | ||
1174 | }; | 1167 | }; |
1175 | 1168 | ||
1176 | struct il_power_mgr { | 1169 | struct il_power_mgr { |
@@ -1278,6 +1271,14 @@ struct il_priv { | |||
1278 | 1271 | ||
1279 | struct il_qos_info qos_data; | 1272 | struct il_qos_info qos_data; |
1280 | 1273 | ||
1274 | struct { | ||
1275 | bool enabled; | ||
1276 | bool is_40mhz; | ||
1277 | bool non_gf_sta_present; | ||
1278 | u8 protection; | ||
1279 | u8 extension_chan_offset; | ||
1280 | } ht; | ||
1281 | |||
1281 | /* | 1282 | /* |
1282 | * We declare this const so it can only be | 1283 | * We declare this const so it can only be |
1283 | * changed via explicit cast within the | 1284 | * changed via explicit cast within the |