iwlwifi: check short GI support per-station rather than globally

[pandora-kernel.git] / drivers / net / wireless / iwlwifi / iwl-dev.h

diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index db74534..e6a1c6f 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -508,7 +508,6 @@ struct iwl_ht_info {
        u8 supported_chan_width;
        u8 sm_ps;
        u8 is_green_field;
-       u8 sgf;                 /* HT_SHORT_GI_* short guard interval */
        struct ieee80211_mcs_info mcs;
        /* BSS related data */
        u8 extension_chan_offset;
@@ -728,9 +727,6 @@ struct iwl_dma_ptr {
        size_t size;
 };
 
-#define HT_SHORT_GI_20MHZ      (1 << 0)
-#define HT_SHORT_GI_40MHZ      (1 << 1)
-
 #define IWL_CHANNEL_WIDTH_20MHZ   0
 #define IWL_CHANNEL_WIDTH_40MHZ   1