tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
b43: update some transmit header constants
Some constants were missing and are added now.
The rate mode was renamed, at least the ucode in brcsmac uses 2 for HT
rates (iee80211n) and the more recent ucodes are using 3 for VHT
(ieee80211ac).
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
authored by
Hauke Mehrtens
and committed by
John W. Linville
0996c391
30adb4d7
+13
-9
+13
-9
drivers/net/wireless/b43/xmit.h
+13
-9
drivers/net/wireless/b43/xmit.h
···
97
97
};
98
98
99
99
/* MAC TX control */
100
+
#define B43_TXH_MAC_RTS_FB_SHORTPRMBL 0x80000000 /* RTS fallback preamble */
101
+
#define B43_TXH_MAC_RTS_SHORTPRMBL 0x40000000 /* RTS main rate preamble */
102
+
#define B43_TXH_MAC_FB_SHORTPRMBL 0x20000000 /* Main fallback preamble */
100
103
#define B43_TXH_MAC_USEFBR 0x10000000 /* Use fallback rate for this AMPDU */
101
104
#define B43_TXH_MAC_KEYIDX 0x0FF00000 /* Security key index */
102
105
#define B43_TXH_MAC_KEYIDX_SHIFT 20
106
+
#define B43_TXH_MAC_ALT_TXPWR 0x00080000 /* Use alternate txpwr defined at loc. M_ALT_TXPWR_IDX */
103
107
#define B43_TXH_MAC_KEYALG 0x00070000 /* Security key algorithm */
104
108
#define B43_TXH_MAC_KEYALG_SHIFT 16
105
109
#define B43_TXH_MAC_AMIC 0x00008000 /* AMIC */
···
130
126
#define B43_TXH_EFT_FB 0x03 /* Data frame fallback encoding */
131
127
#define B43_TXH_EFT_FB_CCK 0x00 /* CCK */
132
128
#define B43_TXH_EFT_FB_OFDM 0x01 /* OFDM */
133
-
#define B43_TXH_EFT_FB_EWC 0x02 /* EWC */
134
-
#define B43_TXH_EFT_FB_N 0x03 /* N */
129
+
#define B43_TXH_EFT_FB_HT 0x02 /* HT */
130
+
#define B43_TXH_EFT_FB_VHT 0x03 /* VHT */
135
131
#define B43_TXH_EFT_RTS 0x0C /* RTS/CTS encoding */
136
132
#define B43_TXH_EFT_RTS_CCK 0x00 /* CCK */
137
133
#define B43_TXH_EFT_RTS_OFDM 0x04 /* OFDM */
138
-
#define B43_TXH_EFT_RTS_EWC 0x08 /* EWC */
139
-
#define B43_TXH_EFT_RTS_N 0x0C /* N */
134
+
#define B43_TXH_EFT_RTS_HT 0x08 /* HT */
135
+
#define B43_TXH_EFT_RTS_VHT 0x0C /* VHT */
140
136
#define B43_TXH_EFT_RTSFB 0x30 /* RTS/CTS fallback encoding */
141
137
#define B43_TXH_EFT_RTSFB_CCK 0x00 /* CCK */
142
138
#define B43_TXH_EFT_RTSFB_OFDM 0x10 /* OFDM */
143
-
#define B43_TXH_EFT_RTSFB_EWC 0x20 /* EWC */
144
-
#define B43_TXH_EFT_RTSFB_N 0x30 /* N */
139
+
#define B43_TXH_EFT_RTSFB_HT 0x20 /* HT */
140
+
#define B43_TXH_EFT_RTSFB_VHT 0x30 /* VHT */
145
141
146
142
/* PHY TX control word */
147
143
#define B43_TXH_PHY_ENC 0x0003 /* Data frame encoding */
148
144
#define B43_TXH_PHY_ENC_CCK 0x0000 /* CCK */
149
145
#define B43_TXH_PHY_ENC_OFDM 0x0001 /* OFDM */
150
-
#define B43_TXH_PHY_ENC_EWC 0x0002 /* EWC */
151
-
#define B43_TXH_PHY_ENC_N 0x0003 /* N */
146
+
#define B43_TXH_PHY_ENC_HT 0x0002 /* HT */
147
+
#define B43_TXH_PHY_ENC_VHT 0x0003 /* VHT */
152
148
#define B43_TXH_PHY_SHORTPRMBL 0x0010 /* Use short preamble */
153
149
#define B43_TXH_PHY_ANT 0x03C0 /* Antenna selection */
154
150
#define B43_TXH_PHY_ANT0 0x0000 /* Use antenna 0 */
···
166
162
#define B43_TXH_PHY1_BW_20 0x0002 /* 20 MHz */
167
163
#define B43_TXH_PHY1_BW_20U 0x0003 /* 20 MHz upper */
168
164
#define B43_TXH_PHY1_BW_40 0x0004 /* 40 MHz */
169
-
#define B43_TXH_PHY1_BW_40DUP 0x0005 /* 50 MHz duplicate */
165
+
#define B43_TXH_PHY1_BW_40DUP 0x0005 /* 40 MHz duplicate */
170
166
#define B43_TXH_PHY1_MODE 0x0038 /* Mode */
171
167
#define B43_TXH_PHY1_MODE_SISO 0x0000 /* SISO */
172
168
#define B43_TXH_PHY1_MODE_CDD 0x0008 /* CDD */