diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-11-14 22:44:02 -0500 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-11-14 22:44:02 -0500 |
| commit | d06fc1d9b5518582f4982f908e820f2303d1eece (patch) | |
| tree | 969d1ccf3cc47e8fe1c2154f75502cf9b67e9402 /net/mac80211/ieee80211_i.h | |
| parent | 99fee6d7e5748d96884667a4628118f7fc130ea0 (diff) | |
| parent | 66fbb541a5d2d58fdae21c1e7b558a75bfbd483f (diff) | |
Merge branch 'fixes-davem' 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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index b4e32ab3664d..72e1c93dd87e 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
| @@ -242,6 +242,8 @@ struct ieee80211_if_sta { | |||
| 242 | u8 bssid[ETH_ALEN], prev_bssid[ETH_ALEN]; | 242 | u8 bssid[ETH_ALEN], prev_bssid[ETH_ALEN]; |
| 243 | u8 ssid[IEEE80211_MAX_SSID_LEN]; | 243 | u8 ssid[IEEE80211_MAX_SSID_LEN]; |
| 244 | size_t ssid_len; | 244 | size_t ssid_len; |
| 245 | u8 scan_ssid[IEEE80211_MAX_SSID_LEN]; | ||
| 246 | size_t scan_ssid_len; | ||
| 245 | u16 aid; | 247 | u16 aid; |
| 246 | u16 ap_capab, capab; | 248 | u16 ap_capab, capab; |
| 247 | u8 *extra_ie; /* to be added to the end of AssocReq */ | 249 | u8 *extra_ie; /* to be added to the end of AssocReq */ |