Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...

[deliverable/linux.git] / drivers / net / wireless / b43legacy / xmit.h

diff --git a/drivers/net/wireless/b43legacy/xmit.h b/drivers/net/wireless/b43legacy/xmit.h
index 62e09d02788fb74648b13bfe324c35588ee50d87..91633087a20bfd28279a2972e3d4f8cc85d434ad 100644 (file)
--- a/drivers/net/wireless/b43legacy/xmit.h
+++ b/drivers/net/wireless/b43legacy/xmit.h
@@ -67,7 +67,9 @@ struct b43legacy_txhdr_fw3 {
 #define B43legacy_TX4_EFT_RTSFBOFDM    0x0010 /* RTS/CTS fallback rate type */
 
 /* PHY TX control word */
-#define B43legacy_TX4_PHY_OFDM         0x0001 /* Data frame rate type */
+#define B43legacy_TX4_PHY_ENC          0x0003 /* Data frame encoding */
+#define B43legacy_TX4_PHY_ENC_CCK      0x0000 /* CCK */
+#define B43legacy_TX4_PHY_ENC_OFDM     0x0001 /* Data frame rate type */
 #define B43legacy_TX4_PHY_SHORTPRMBL   0x0010 /* Use short preamble */
 #define B43legacy_TX4_PHY_ANT          0x03C0 /* Antenna selection */
 #define  B43legacy_TX4_PHY_ANT0                0x0000 /* Use antenna 0 */