From 1c03c4620edc551b5bbcc87c7aca02b482d8bc51 Mon Sep 17 00:00:00 2001 From: Stanislaw Gruszka Date: Fri, 3 Feb 2012 17:31:52 +0100 Subject: iwlegacy: move ht out of ctx structure Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville --- drivers/net/wireless/iwlegacy/common.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'drivers/net/wireless/iwlegacy/common.h') 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 { * we already removed the vif for type setting. */ bool always_active, is_active; - - struct { - bool non_gf_sta_present; - u8 protection; - bool enabled, is_40mhz; - u8 extension_chan_offset; - } ht; }; struct il_power_mgr { @@ -1278,6 +1271,14 @@ struct il_priv { struct il_qos_info qos_data; + struct { + bool enabled; + bool is_40mhz; + bool non_gf_sta_present; + u8 protection; + u8 extension_chan_offset; + } ht; + /* * We declare this const so it can only be * changed via explicit cast within the -- cgit v1.2.2