From patchwork Sat Nov 14 16:05:56 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Felix Fietkau <nbd@openwrt.org>
X-Patchwork-Id: 60046
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nAEG69Dp004084
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Sat, 14 Nov 2009 16:06:09 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754973AbZKNQGC (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Sat, 14 Nov 2009 11:06:02 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754898AbZKNQGC
	(ORCPT <rfc822;linux-wireless-outgoing>);
	Sat, 14 Nov 2009 11:06:02 -0500
Received: from nbd.name ([88.198.39.176]:47382 "EHLO ds10.mine.nu"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754702AbZKNQGB (ORCPT <rfc822; linux-wireless@vger.kernel.org>);
	Sat, 14 Nov 2009 11:06:01 -0500
Received: from p5ddc4d17.dip.t-dialin.net ([93.220.77.23] helo=pi.local)
	by ds10.mine.nu with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <nbd@openwrt.org>)
	id 1N9LCK-0008Dx-BT; Sat, 14 Nov 2009 17:10:00 +0100
Message-ID: <4AFED564.8030804@openwrt.org>
Date: Sat, 14 Nov 2009 17:05:56 +0100
From: Felix Fietkau <nbd@openwrt.org>
User-Agent: Thunderbird 2.0.0.23 (Macintosh/20090812)
MIME-Version: 1.0
To: linux-wireless <linux-wireless@vger.kernel.org>
CC: "Luis R. Rodriguez" <mcgrof@gmail.com>,
	Johannes Berg <johannes@sipsolutions.net>,
	"John W. Linville" <linville@tuxdriver.com>
Subject: [PATCH 1/2] mac80211: add private driver flags and ampdu length to
	tx info
X-Enigmail-Version: 0.96.0
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org


--- 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
  * @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.
  * @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.
  * @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 {
 			u8 ampdu_ack_len;
 			u64 ampdu_ack_map;
 			int ack_signal;
-			/* 8 bytes free */
+			u8 ampdu_len;
+			/* 7 bytes free */
 		} status;
 		struct {
 			struct ieee80211_tx_rate driver_rates[