diff options
-rw-r--r-- | include/net/mac80211.h | 2 | ||||
-rw-r--r-- | net/mac80211/sta_info.h | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index c813fbf7d364..0dbbfc7b0509 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -1269,8 +1269,6 @@ enum ieee80211_ampdu_mlme_action { | |||
1269 | * This is needed only for IBSS mode and the result of this function is | 1269 | * This is needed only for IBSS mode and the result of this function is |
1270 | * used to determine whether to reply to Probe Requests. | 1270 | * used to determine whether to reply to Probe Requests. |
1271 | * | 1271 | * |
1272 | * @conf_ht: Configures low level driver with 802.11n HT data. Must be atomic. | ||
1273 | * | ||
1274 | * @ampdu_action: Perform a certain A-MPDU action | 1272 | * @ampdu_action: Perform a certain A-MPDU action |
1275 | * The RA/TID combination determines the destination and TID we want | 1273 | * The RA/TID combination determines the destination and TID we want |
1276 | * the ampdu action to be performed for. The action is defined through | 1274 | * the ampdu action to be performed for. The action is defined through |
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index 5ad9250b63ab..dc2606d0ae77 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h | |||
@@ -169,9 +169,6 @@ struct sta_ampdu_mlme { | |||
169 | * @lock: used for locking all fields that require locking, see comments | 169 | * @lock: used for locking all fields that require locking, see comments |
170 | * in the header file. | 170 | * in the header file. |
171 | * @flaglock: spinlock for flags accesses | 171 | * @flaglock: spinlock for flags accesses |
172 | * @addr: MAC address of this STA | ||
173 | * @aid: STA's unique AID (1..2007, 0 = not assigned yet), | ||
174 | * only used in AP (and IBSS?) mode | ||
175 | * @listen_interval: listen interval of this station, when we're acting as AP | 172 | * @listen_interval: listen interval of this station, when we're acting as AP |
176 | * @pin_status: used internally for pinning a STA struct into memory | 173 | * @pin_status: used internally for pinning a STA struct into memory |
177 | * @flags: STA flags, see &enum ieee80211_sta_info_flags | 174 | * @flags: STA flags, see &enum ieee80211_sta_info_flags |