aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/mac80211.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-11-06 08:13:34 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-11-09 16:14:09 -0500
commita729cff8ad5120d0d5172ec28a3843d1cb458f79 (patch)
tree96e85c0805050ba03a2df2a4278640da8f0454c5 /include/net/mac80211.h
parent1f074bd8eb7a4a210a5119cd7220f89da6c7a2c3 (diff)
mac80211: implement wifi TX status
Implement the socket wifi TX status error queue reflection in mac80211. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r--include/net/mac80211.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index b9b9c9452131..2714646b298f 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -518,7 +518,7 @@ struct ieee80211_tx_rate {
518 * @flags: transmit info flags, defined above 518 * @flags: transmit info flags, defined above
519 * @band: the band to transmit on (use for checking for races) 519 * @band: the band to transmit on (use for checking for races)
520 * @antenna_sel_tx: antenna to use, 0 for automatic diversity 520 * @antenna_sel_tx: antenna to use, 0 for automatic diversity
521 * @pad: padding, ignore 521 * @ack_frame_id: internal frame ID for TX status, used internally
522 * @control: union for control data 522 * @control: union for control data
523 * @status: union for status data 523 * @status: union for status data
524 * @driver_data: array of driver_data pointers 524 * @driver_data: array of driver_data pointers
@@ -535,8 +535,7 @@ struct ieee80211_tx_info {
535 535
536 u8 antenna_sel_tx; 536 u8 antenna_sel_tx;
537 537
538 /* 2 byte hole */ 538 u16 ack_frame_id;
539 u8 pad[2];
540 539
541 union { 540 union {
542 struct { 541 struct {