X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=blobdiff_plain;f=include%2Fshared%2Fwlan.h;h=9e1324b67e08e19cc0bea538b74ed9ab0b5fb924;hp=ce8885ba6cc9ef493b7dc200d45f2124630c1234;hb=19e4d682fca010ef72e0a304335910f670c2268a;hpb=f19956767de59e88f34f7f17112fd79760ad2918

diff --git a/include/shared/wlan.h b/include/shared/wlan.h
index ce8885b..9e1324b 100644
--- a/include/shared/wlan.h
+++ b/include/shared/wlan.h
@@ -74,6 +74,9 @@
 #define	AR9170_RX_STATUS_MPDU_MIDDLE		0x30
 #define	AR9170_RX_STATUS_MPDU_LAST		0x10
 
+#define	AR9170_RX_STATUS_CONT_AGGR		0x40
+#define	AR9170_RX_STATUS_TOTAL_ERROR		0x80
+
 #define	AR9170_RX_ERROR_RXTO			0x01
 #define	AR9170_RX_ERROR_OVERRUN			0x02
 #define	AR9170_RX_ERROR_DECRYPT			0x04
@@ -81,7 +84,6 @@
 #define	AR9170_RX_ERROR_WRONG_RA		0x10
 #define	AR9170_RX_ERROR_PLCP			0x20
 #define	AR9170_RX_ERROR_MMIC			0x40
-#define	AR9170_RX_ERROR_FATAL			0x80
 
 /* these are either-or */
 #define	AR9170_TX_MAC_PROT_RTS			0x0001
@@ -249,7 +251,7 @@ struct carl9170_tx_superdesc {
 	u8 ampdu_commit_factor:1;
 	u8 ampdu_unused_bit:1;
 	u8 queue:2;
-	u8 reserved:1;
+	u8 assign_seq:1;
 	u8 vif_id:3;
 	u8 fill_in_tsf:1;
 	u8 cab:1;
@@ -297,6 +299,7 @@ struct _ar9170_tx_hwdesc {
 
 #define CARL9170_TX_SUPER_MISC_QUEUE			0x3
 #define CARL9170_TX_SUPER_MISC_QUEUE_S			0
+#define CARL9170_TX_SUPER_MISC_ASSIGN_SEQ		0x4
 #define	CARL9170_TX_SUPER_MISC_VIF_ID			0x38
 #define	CARL9170_TX_SUPER_MISC_VIF_ID_S			3
 #define	CARL9170_TX_SUPER_MISC_FILL_IN_TSF		0x40
@@ -336,7 +339,7 @@ struct ar9170_rx_head {
 	u8 plcp[12];
 } __packed;
 
-#define AR9170_RX_HEAD_LEN			12
+#define	AR9170_RX_HEAD_LEN			12
 
 struct ar9170_rx_phystatus {
 	union {
@@ -352,7 +355,7 @@ struct ar9170_rx_phystatus {
 	u8 phy_err;
 } __packed;
 
-#define AR9170_RX_PHYSTATUS_LEN			20
+#define	AR9170_RX_PHYSTATUS_LEN			20
 
 struct ar9170_rx_macstatus {
 	u8 SAidx, DAidx;
@@ -360,7 +363,7 @@ struct ar9170_rx_macstatus {
 	u8 status;
 } __packed;
 
-#define AR9170_RX_MACSTATUS_LEN			4
+#define	AR9170_RX_MACSTATUS_LEN			4
 
 struct ar9170_rx_frame_single {
 	struct ar9170_rx_head phy_head;
@@ -411,6 +414,23 @@ enum ar9170_txq {
 	__AR9170_NUM_TXQ,
 };
 
+/*
+ * This is an workaround for several undocumented bugs.
+ * Don't mess with the QoS/AC <-> HW Queue map, if you don't
+ * know what you are doing.
+ *
+ * Known problems [hardware]:
+ *  * The MAC does not aggregate frames on anything other
+ *    than the first HW queue.
+ *  * when an AMPDU is placed [in the first hw queue] and
+ *    additional frames are already queued on a different
+ *    hw queue, the MAC will ALWAYS freeze.
+ *
+ * In a nutshell: The hardware can either do QoS or
+ * Aggregation but not both at the same time. As a
+ * result, this makes the device pretty much useless
+ * for any serious 802.11n setup.
+ */
 static const u8 ar9170_qmap[__AR9170_NUM_TXQ] = { 2, 1, 0, 3 };
 
 #define	AR9170_TXQ_DEPTH			32