Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / include / net / ieee80211softmac.h

diff --git a/include/net/ieee80211softmac.h b/include/net/ieee80211softmac.h
index 6b3693f05ca05722660df48af1cb352a17a70c3e..052ed596a4e487de798d0513f472ce842b66ba21 100644 (file)
--- 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;
@@ -201,7 +204,8 @@ struct ieee80211softmac_device {
        
        /* couple of flags */
        u8 scanning:1, /* protects scanning from being done multiple times at once */
-          associated:1;
+          associated:1,
+          running:1;
        
        struct ieee80211softmac_scaninfo *scaninfo;
        struct ieee80211softmac_assoc_info associnfo;