diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-20 17:37:10 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-20 17:37:10 -0500 |
| commit | 518aa1b5443c8a36300c20a5473df01fb8975dad (patch) | |
| tree | 0fe7200d4061dbfcd9b58b8f5f9264edbd9f7c05 /include | |
| parent | 66f9a2590aa87dc77cddaeaf46177de76edd2339 (diff) | |
| parent | 674743033c1ae9f7cc94e1e0037f6f719e6d1d67 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/mac80211.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index b3bd00a9d992..559422fc0943 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
| @@ -322,7 +322,6 @@ struct ieee80211_tx_rate { | |||
| 322 | * @control: union for control data | 322 | * @control: union for control data |
| 323 | * @status: union for status data | 323 | * @status: union for status data |
| 324 | * @driver_data: array of driver_data pointers | 324 | * @driver_data: array of driver_data pointers |
| 325 | * @retry_count: number of retries | ||
| 326 | * @ampdu_ack_len: number of aggregated frames. | 325 | * @ampdu_ack_len: number of aggregated frames. |
| 327 | * relevant only if IEEE80211_TX_STATUS_AMPDU was set. | 326 | * relevant only if IEEE80211_TX_STATUS_AMPDU was set. |
| 328 | * @ampdu_ack_map: block ack bit map for the aggregation. | 327 | * @ampdu_ack_map: block ack bit map for the aggregation. |