diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-05 04:28:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-05 04:28:35 -0400 |
| commit | 33e334950abda8e42c3b6e6f280fad0d4ab92141 (patch) | |
| tree | 7d52e5d4772f578c499200f38cfc54b79e3357fb /net/mac80211/ieee80211_i.h | |
| parent | ad619800e4e034cad44299b2a22df9eebb043ac3 (diff) | |
| parent | 3e2236c108792c3afbbfbe3f373ee7fdd68eda8e (diff) | |
Merge branch 'no-ath9k' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index a2e200f9811e..ec59345af65b 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
| @@ -82,6 +82,7 @@ struct ieee80211_sta_bss { | |||
| 82 | 82 | ||
| 83 | u8 bssid[ETH_ALEN]; | 83 | u8 bssid[ETH_ALEN]; |
| 84 | u8 ssid[IEEE80211_MAX_SSID_LEN]; | 84 | u8 ssid[IEEE80211_MAX_SSID_LEN]; |
| 85 | u8 dtim_period; | ||
| 85 | u16 capability; /* host byte order */ | 86 | u16 capability; /* host byte order */ |
| 86 | enum ieee80211_band band; | 87 | enum ieee80211_band band; |
| 87 | int freq; | 88 | int freq; |