rt2x00: checkpatch.pl error fixes for rt2800.h

[net-next-2.6.git] / drivers / net / wireless / rt2x00 / rt2800.h

diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h
index eb8b6cab992516fa8bdf58d2feabcf44950585f3..c2cc126502d6cacc69ad2fd920c4bc4948c71a6d 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
@@ -960,8 +960,31 @@
 
 /*
  * TXOP_CTRL_CFG:
+ * TIMEOUT_TRUN_EN: Enable/Disable TXOP timeout truncation
+ * AC_TRUN_EN: Enable/Disable truncation for AC change
+ * TXRATEGRP_TRUN_EN: Enable/Disable truncation for TX rate group change
+ * USER_MODE_TRUN_EN: Enable/Disable truncation for user TXOP mode
+ * MIMO_PS_TRUN_EN: Enable/Disable truncation for MIMO PS RTS/CTS
+ * RESERVED_TRUN_EN: Reserved
+ * LSIG_TXOP_EN: Enable/Disable L-SIG TXOP protection
+ * EXT_CCA_EN: Enable/Disable extension channel CCA reference (Defer 40Mhz
+ *            transmissions if extension CCA is clear).
+ * EXT_CCA_DLY: Extension CCA signal delay time (unit: us)
+ * EXT_CWMIN: CwMin for extension channel backoff
+ *           0: Disabled
+ *
  */
 #define TXOP_CTRL_CFG                  0x1340
+#define TXOP_CTRL_CFG_TIMEOUT_TRUN_EN  FIELD32(0x00000001)
+#define TXOP_CTRL_CFG_AC_TRUN_EN       FIELD32(0x00000002)
+#define TXOP_CTRL_CFG_TXRATEGRP_TRUN_EN        FIELD32(0x00000004)
+#define TXOP_CTRL_CFG_USER_MODE_TRUN_EN        FIELD32(0x00000008)
+#define TXOP_CTRL_CFG_MIMO_PS_TRUN_EN  FIELD32(0x00000010)
+#define TXOP_CTRL_CFG_RESERVED_TRUN_EN FIELD32(0x00000020)
+#define TXOP_CTRL_CFG_LSIG_TXOP_EN     FIELD32(0x00000040)
+#define TXOP_CTRL_CFG_EXT_CCA_EN       FIELD32(0x00000080)
+#define TXOP_CTRL_CFG_EXT_CCA_DLY      FIELD32(0x0000ff00)
+#define TXOP_CTRL_CFG_EXT_CWMIN                FIELD32(0x000f0000)
 
 /*
  * TX_RTS_CFG:
@@ -1485,17 +1508,17 @@
 #define SHARED_KEY_MODE_BASE           0x7000
 
 #define MAC_WCID_ENTRY(__idx) \
-       ( MAC_WCID_BASE + ((__idx) * sizeof(struct mac_wcid_entry)) )
+       (MAC_WCID_BASE + ((__idx) * sizeof(struct mac_wcid_entry)))
 #define PAIRWISE_KEY_ENTRY(__idx) \
-       ( PAIRWISE_KEY_TABLE_BASE + ((__idx) * sizeof(struct hw_key_entry)) )
+       (PAIRWISE_KEY_TABLE_BASE + ((__idx) * sizeof(struct hw_key_entry)))
 #define MAC_IVEIV_ENTRY(__idx) \
-       ( MAC_IVEIV_TABLE_BASE + ((__idx) * sizeof(struct mac_iveiv_entry)) )
+       (MAC_IVEIV_TABLE_BASE + ((__idx) * sizeof(struct mac_iveiv_entry)))
 #define MAC_WCID_ATTR_ENTRY(__idx) \
-       ( MAC_WCID_ATTRIBUTE_BASE + ((__idx) * sizeof(u32)) )
+       (MAC_WCID_ATTRIBUTE_BASE + ((__idx) * sizeof(u32)))
 #define SHARED_KEY_ENTRY(__idx) \
-       ( SHARED_KEY_TABLE_BASE + ((__idx) * sizeof(struct hw_key_entry)) )
+       (SHARED_KEY_TABLE_BASE + ((__idx) * sizeof(struct hw_key_entry)))
 #define SHARED_KEY_MODE_ENTRY(__idx) \
-       ( SHARED_KEY_MODE_BASE + ((__idx) * sizeof(u32)) )
+       (SHARED_KEY_MODE_BASE + ((__idx) * sizeof(u32)))
 
 struct mac_wcid_entry {
        u8 mac[6];
@@ -1635,9 +1658,9 @@ struct mac_iveiv_entry {
 #define HW_BEACON_BASE7                        0x5bc0
 
 #define HW_BEACON_OFFSET(__index) \
-       ( ((__index) < 4) ? ( HW_BEACON_BASE0 + (__index * 0x0200) ) : \
-         (((__index) < 6) ? ( HW_BEACON_BASE4 + ((__index - 4) * 0x0200) ) : \
-         (HW_BEACON_BASE6 - ((__index - 6) * 0x0200))) )
+       (((__index) < 4) ? (HW_BEACON_BASE0 + (__index * 0x0200)) : \
+         (((__index) < 6) ? (HW_BEACON_BASE4 + ((__index - 4) * 0x0200)) : \
+         (HW_BEACON_BASE6 - ((__index - 6) * 0x0200))))
 
 /*
  * BBP registers.
@@ -1987,8 +2010,8 @@ struct mac_iveiv_entry {
 /*
  * DMA descriptor defines.
  */
-#define TXWI_DESC_SIZE                 ( 4 * sizeof(__le32) )
-#define RXWI_DESC_SIZE                 ( 4 * sizeof(__le32) )
+#define TXWI_DESC_SIZE                 (4 * sizeof(__le32))
+#define RXWI_DESC_SIZE                 (4 * sizeof(__le32))
 
 /*
  * TX WI structure