Merge branch 'pxa-tosa' into pxa

[linux-2.6] / net / mac80211 / ieee80211_i.h

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index c642538e8282c88c5676d56e8c83a7b515bca5b1..006486b267261fa3f18b6dc3e1bb8f53f7e46efb 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -102,7 +102,7 @@ struct ieee80211_sta_bss {
        u64 timestamp;
        int beacon_int;
 
-       int probe_resp;
+       bool probe_resp;
        unsigned long last_update;
 
        /* during assocation, we save an ERP value from a probe response so
@@ -354,7 +354,7 @@ struct ieee80211_if_sta {
        int preq_queue_len;
        struct mesh_stats mshstats;
        struct mesh_config mshcfg;
-       u8 mesh_seqnum[3];
+       u32 mesh_seqnum;
        bool accepting_plinks;
 #endif
        u16 aid;
@@ -600,8 +600,7 @@ struct ieee80211_local {
        /*
         * The lock only protects the list, hash, timer and counter
         * against manipulation, reads are done in RCU. Additionally,
-        * the lock protects each BSS's TIM bitmap, a few items in
-        * STA info structures and various key pointers.
+        * the lock protects each BSS's TIM bitmap.
         */
        spinlock_t sta_lock;
        unsigned long num_sta;
@@ -635,6 +634,13 @@ struct ieee80211_local {
 
        struct list_head interfaces;
 
+       /*
+        * Key lock, protects sdata's key_list and sta_info's
+        * key pointers (write access, they're RCU.)
+        */
+       spinlock_t key_lock;
+
+
        bool sta_sw_scanning;
        bool sta_hw_scanning;
        int scan_channel_idx;
@@ -893,7 +899,7 @@ extern const struct iw_handler_def ieee80211_iw_handler_def;
 
 
 /* ieee80211_ioctl.c */
-int ieee80211_set_freq(struct ieee80211_local *local, int freq);
+int ieee80211_set_freq(struct net_device *dev, int freq);
 /* ieee80211_sta.c */
 void ieee80211_sta_timer(unsigned long data);
 void ieee80211_sta_work(struct work_struct *work);