summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2x00reg.h
diff options
context:
space:
mode:
authorHelmut Schaa2010-05-07 11:03:08 +0200
committerJohn W. Linville2010-05-07 20:57:21 +0200
commit1affa091975e47d50ce6a88e9b1abfe717c2fe27 (patch)
treef278fcbf35ea04e619de3d07ac1234d174f9c943 /drivers/net/wireless/rt2x00/rt2x00reg.h
parentwl1271: Reduce PSM entry hang over period from 128 => 1 ms (diff)
downloadkernel-qcow2-linux-1affa091975e47d50ce6a88e9b1abfe717c2fe27.tar.gz
kernel-qcow2-linux-1affa091975e47d50ce6a88e9b1abfe717c2fe27.tar.xz
kernel-qcow2-linux-1affa091975e47d50ce6a88e9b1abfe717c2fe27.zip
rt2x00: rt2800: use correct txop value in tx descriptor
rt2800 devices use a different enumeration to specify what IFS values should be used on frame transmission compared to the other rt2x00 devices. Hence, create a new enum called txop that contains the valid values. Furthermore use the appropriate txop values as found in the ralink drivers: - TXOP_BACKOFF for management frames - TXOP_SIFS for subsequent fragments in a burst - TXOP_HTTXOP for all data frames Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> Acked-by: Ivo van Doorn <IvDoorn@gmail.com> Acked-by: Gertjan van Wingerde <gwingerde@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00reg.h')
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00reg.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00reg.h b/drivers/net/wireless/rt2x00/rt2x00reg.h
index 603bfc0adaa3..b9fe94873ee0 100644
--- a/drivers/net/wireless/rt2x00/rt2x00reg.h
+++ b/drivers/net/wireless/rt2x00/rt2x00reg.h
@@ -101,6 +101,16 @@ enum ifs {
};
/*
+ * IFS backoff values for HT devices
+ */
+enum txop {
+ TXOP_HTTXOP = 0,
+ TXOP_PIFS = 1,
+ TXOP_SIFS = 2,
+ TXOP_BACKOFF = 3,
+};
+
+/*
* Cipher types for hardware encryption
*/
enum cipher {