---

yaml --- r: 122021 b: refs/heads/master c: 0ed94ea h: refs/heads/master i: 122019: 62301a1 v: v3
git-mirror · Nov 21, 2008 · 41b09e0 · 41b09e0
1 parent 9fd9a2f
commit 41b09e0
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4e58cf8cc646d93de852f32f972448a95387c60
+refs/heads/master: 0ed94eaaed618634f68197161203aac9f849471e
diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h
@@ -1269,8 +1269,6 @@ enum ieee80211_ampdu_mlme_action {
  *	This is needed only for IBSS mode and the result of this function is
  *	used to determine whether to reply to Probe Requests.
  *
- * @conf_ht: Configures low level driver with 802.11n HT data. Must be atomic.
- *
  * @ampdu_action: Perform a certain A-MPDU action
  * 	The RA/TID combination determines the destination and TID we want
  * 	the ampdu action to be performed for. The action is defined through

diff --git a/trunk/net/mac80211/sta_info.h b/trunk/net/mac80211/sta_info.h
@@ -169,9 +169,6 @@ struct sta_ampdu_mlme {
  * @lock: used for locking all fields that require locking, see comments
  *	in the header file.
  * @flaglock: spinlock for flags accesses
- * @addr: MAC address of this STA
- * @aid: STA's unique AID (1..2007, 0 = not assigned yet),
- *	only used in AP (and IBSS?) mode
  * @listen_interval: listen interval of this station, when we're acting as AP
  * @pin_status: used internally for pinning a STA struct into memory
  * @flags: STA flags, see &enum ieee80211_sta_info_flags