summaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/520-driver_flags.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-11-15 22:05:03 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-11-15 22:05:03 +0000
commit76fbd95419d679c21622d15b0a35b9e8be466f5c (patch)
tree122ea9940bfd259291ee088ac130bc4e40211e11 /package/mac80211/patches/520-driver_flags.patch
parent89dfc3133ae37b6c1b18a1086342504339258b08 (diff)
mac80211: adjust patches based on upstream feedback
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18431 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/520-driver_flags.patch')
-rw-r--r--package/mac80211/patches/520-driver_flags.patch25
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 d27c502ec..13d85ee1e 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;