diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-08 19:59:05 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-08 19:59:05 -0400 |
| commit | 17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b (patch) | |
| tree | 88bb1fcf84f9ebfa4299c9a8dcd9e6330b358446 /drivers/net/wireless/iwlwifi/iwl-dev.h | |
| parent | 712d6954e3998d0de2840d8130941e8042541246 (diff) | |
| parent | 82a28c794f27aac17d7a3ebd7f14d731a11a5532 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
net/mac80211/mlme.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-dev.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index 1943de3f7649..640ceea913c7 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h | |||
| @@ -406,7 +406,6 @@ struct iwl_ht_info { | |||
| 406 | /* self configuration data */ | 406 | /* self configuration data */ |
| 407 | u8 is_ht; | 407 | u8 is_ht; |
| 408 | u8 supported_chan_width; | 408 | u8 supported_chan_width; |
| 409 | u16 tx_mimo_ps_mode; | ||
| 410 | u8 is_green_field; | 409 | u8 is_green_field; |
| 411 | u8 sgf; /* HT_SHORT_GI_* short guard interval */ | 410 | u8 sgf; /* HT_SHORT_GI_* short guard interval */ |
| 412 | u8 max_amsdu_size; | 411 | u8 max_amsdu_size; |