diff options
author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2006-04-29 02:42:26 +0200 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-29 02:42:26 +0200 |
commit | d6754b401a15eaa16492ea5dbaa4826361d3f411 (patch) | |
tree | 032f067d3af458527d903a7653885404ed82431e /include/net | |
parent | linux/blkpg.h needs <linux/compiler.h> for __user (diff) | |
parent | [PATCH] slab: fix crash on __drain_alien_cahce() during CPU Hotplug (diff) | |
download | linux-d6754b401a15eaa16492ea5dbaa4826361d3f411.tar.xz linux-d6754b401a15eaa16492ea5dbaa4826361d3f411.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/ieee80211softmac.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/net/ieee80211softmac.h b/include/net/ieee80211softmac.h index 6b3693f05ca0..b1ebfbae397f 100644 --- a/include/net/ieee80211softmac.h +++ b/include/net/ieee80211softmac.h @@ -96,10 +96,13 @@ struct ieee80211softmac_assoc_info { * * bssvalid is true if we found a matching network * and saved it's BSSID into the bssid above. + * + * bssfixed is used for SIOCSIWAP. */ u8 static_essid:1, associating:1, - bssvalid:1; + bssvalid:1, + bssfixed:1; /* Scan retries remaining */ int scan_retry; |