---

yaml --- r: 150413 b: refs/heads/master c: cce4c77 h: refs/heads/master i: 150411: 66c7ee9 v: v3
git-mirror · May 20, 2009 · 5fc4081 · 5fc4081
1 parent 9f60d6d
commit 5fc4081
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c617b0324c4b05e8e08f14407a9be3b7756768f
+refs/heads/master: cce4c77b87ce7e71a0f244a3dfb6ac1c3a1bc67e
diff --git a/trunk/Documentation/DocBook/mac80211.tmpl b/trunk/Documentation/DocBook/mac80211.tmpl
@@ -145,7 +145,6 @@ usage should require reading the full document.
         interface in STA mode at first!
       </para>
 !Finclude/net/mac80211.h ieee80211_if_init_conf
-!Finclude/net/mac80211.h ieee80211_if_conf
     </chapter>
 
     <chapter id="rx-tx">

diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h
@@ -173,7 +173,6 @@ enum ieee80211_bss_change {
  * @timestamp: beacon timestamp
  * @beacon_int: beacon interval
  * @assoc_capability: capabilities taken from assoc resp
- * @ht: BSS's HT configuration
  * @basic_rates: bitmap of basic rates, each bit stands for an
  *	index into the rate table configured by the driver in
  *	the current band.

diff --git a/trunk/net/mac80211/sta_info.h b/trunk/net/mac80211/sta_info.h
@@ -216,6 +216,7 @@ struct sta_ampdu_mlme {
  * @plink_state: peer link state
  * @plink_timeout: timeout of peer link
  * @plink_timer: peer link watch timer
+ * @plink_timer_was_running: used by suspend/resume to restore timers
  * @debugfs: debug filesystem info
  * @sta: station information we share with the driver
  */