diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-11-15 22:05:03 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-11-15 22:05:03 +0000 |
| commit | b01e1d4916c1bfe5e438f06f049e842e7d491d15 (patch) | |
| tree | 8d6fc36da0b3a7e3157d3b9b262f922f39dcecec /package/mac80211/patches/520-driver_flags.patch | |
| parent | 46560d64a8cad45a57b7f869d8ed556ab24ed7cf (diff) | |
| download | master-31e0f0ae-b01e1d4916c1bfe5e438f06f049e842e7d491d15.tar.gz master-31e0f0ae-b01e1d4916c1bfe5e438f06f049e842e7d491d15.tar.bz2 master-31e0f0ae-b01e1d4916c1bfe5e438f06f049e842e7d491d15.zip | |
mac80211: adjust patches based on upstream feedback
SVN-Revision: 18431
Diffstat (limited to 'package/mac80211/patches/520-driver_flags.patch')
| -rw-r--r-- | package/mac80211/patches/520-driver_flags.patch | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/package/mac80211/patches/520-driver_flags.patch b/package/mac80211/patches/520-driver_flags.patch index d27c502ec2..13d85ee1e2 100644 --- a/package/mac80211/patches/520-driver_flags.patch +++ b/package/mac80211/patches/520-driver_flags.patch @@ -1,37 +1,20 @@ --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -386,14 +386,17 @@ struct ieee80211_tx_rate { - * @flags: transmit info flags, defined above - * @band: the band to transmit on (use for checking for races) - * @antenna_sel_tx: antenna to use, 0 for automatic diversity -+ * @driver_flags: flags for internal driver use - * @pad: padding, ignore +@@ -390,10 +390,12 @@ struct ieee80211_tx_rate { * @control: union for control data * @status: union for status data * @driver_data: array of driver_data pointers - * @ampdu_ack_len: number of aggregated frames. -- * relevant only if IEEE80211_TX_STATUS_AMPDU was set. + * @ampdu_ack_len: number of acked aggregated frames. -+ * relevant only if ieee80211_tx_status_ampdu was set. + * relevant only if IEEE80211_TX_STATUS_AMPDU was set. * @ampdu_ack_map: block ack bit map for the aggregation. * relevant only if IEEE80211_TX_STATUS_AMPDU was set. + * @ampdu_len: number of aggregated frames. -+ * relevant only if ieee80211_tx_status_ampdu was set. ++ * relevant only if IEEE80211_TX_STATUS_AMPDU was set. * @ack_signal: signal strength of the ACK frame */ struct ieee80211_tx_info { -@@ -403,8 +406,8 @@ struct ieee80211_tx_info { - - u8 antenna_sel_tx; - -- /* 2 byte hole */ -- u8 pad[2]; -+ u8 driver_flags; -+ u8 pad; - - union { - struct { -@@ -428,7 +431,8 @@ struct ieee80211_tx_info { +@@ -428,7 +430,8 @@ struct ieee80211_tx_info { u8 ampdu_ack_len; u64 ampdu_ack_map; int ack_signal; |