diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:31 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:31 +0200 |
| commit | 5c807f98e94548dac3fcbd391389c0869f8a9f32 (patch) | |
| tree | d8b652c2d428b78f7bdfd890102b5a5ca2628093 /net/mac80211/ieee80211_i.h | |
| parent | fe07b033c06f6f5e9bda543da22cfa7962325e56 (diff) | |
| parent | bd6a3784c37447e7336759ff4910f6cd3ff89f34 (diff) | |
Merge topic branch 'wlan' into integration-linux-ux500-3.3
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 2f0642d9e15..e65ee7f6244 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -330,6 +330,7 @@ struct ieee80211_work { u8 key_len, key_idx; bool privacy; bool synced; + struct cfg80211_bss *bss; } probe_auth; struct { struct cfg80211_bss *bss; |