aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rsi
diff options
context:
space:
mode:
authorJahnavi Meher <jahnavi.meher@gmail.com>2014-06-16 10:11:41 -0400
committerJohn W. Linville <linville@tuxdriver.com>2014-06-19 15:49:21 -0400
commit4550faac36f532b5600eea8a13f655f4fe39484a (patch)
treef1ecb73e500162abf5836df5d224fc2327d2d21c /drivers/net/wireless/rsi
parentf870a340f12ea7889fff40dbd05c0910ef3ecbd4 (diff)
rsi: Changed the radio caps frame.
Changed the radio caps frame and added the required fields. Signed-off-by: Jahnavi Meher <jahnavi.meher@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rsi')
-rw-r--r--drivers/net/wireless/rsi/rsi_91x_mgmt.c7
-rw-r--r--drivers/net/wireless/rsi/rsi_mgmt.h15
2 files changed, 22 insertions, 0 deletions
diff --git a/drivers/net/wireless/rsi/rsi_91x_mgmt.c b/drivers/net/wireless/rsi/rsi_91x_mgmt.c
index 2cdb36a4239e..c3d8da9b544a 100644
--- a/drivers/net/wireless/rsi/rsi_91x_mgmt.c
+++ b/drivers/net/wireless/rsi/rsi_91x_mgmt.c
@@ -331,6 +331,13 @@ static int rsi_load_radio_caps(struct rsi_common *common)
331 } 331 }
332 } 332 }
333 333
334 radio_caps->sifs_tx_11n = cpu_to_le16(SIFS_TX_11N_VALUE);
335 radio_caps->sifs_tx_11b = cpu_to_le16(SIFS_TX_11B_VALUE);
336 radio_caps->slot_rx_11n = cpu_to_le16(SHORT_SLOT_VALUE);
337 radio_caps->ofdm_ack_tout = cpu_to_le16(OFDM_ACK_TOUT_VALUE);
338 radio_caps->cck_ack_tout = cpu_to_le16(CCK_ACK_TOUT_VALUE);
339 radio_caps->preamble_type = cpu_to_le16(LONG_PREAMBLE);
340
334 radio_caps->desc_word[7] |= cpu_to_le16(radio_id << 8); 341 radio_caps->desc_word[7] |= cpu_to_le16(radio_id << 8);
335 342
336 for (ii = 0; ii < MAX_HW_QUEUES; ii++) { 343 for (ii = 0; ii < MAX_HW_QUEUES; ii++) {
diff --git a/drivers/net/wireless/rsi/rsi_mgmt.h b/drivers/net/wireless/rsi/rsi_mgmt.h
index 0641068d7fec..6ccf9d935e4b 100644
--- a/drivers/net/wireless/rsi/rsi_mgmt.h
+++ b/drivers/net/wireless/rsi/rsi_mgmt.h
@@ -128,6 +128,15 @@
128#define EP_5GHZ_20MHZ 2 128#define EP_5GHZ_20MHZ 2
129#define EP_5GHZ_40MHZ 3 129#define EP_5GHZ_40MHZ 3
130 130
131#define SIFS_TX_11N_VALUE 580
132#define SIFS_TX_11B_VALUE 346
133#define SHORT_SLOT_VALUE 360
134#define LONG_SLOT_VALUE 640
135#define OFDM_ACK_TOUT_VALUE 2720
136#define CCK_ACK_TOUT_VALUE 9440
137#define LONG_PREAMBLE 0x0000
138#define SHORT_PREAMBLE 0x0001
139
131#define RSI_SUPP_FILTERS (FIF_ALLMULTI | FIF_PROBE_REQ |\ 140#define RSI_SUPP_FILTERS (FIF_ALLMULTI | FIF_PROBE_REQ |\
132 FIF_BCN_PRBRESP_PROMISC) 141 FIF_BCN_PRBRESP_PROMISC)
133enum opmode { 142enum opmode {
@@ -243,6 +252,12 @@ struct rsi_radio_caps {
243 u8 num_11n_rates; 252 u8 num_11n_rates;
244 u8 num_11ac_rates; 253 u8 num_11ac_rates;
245 __le16 gcpd_per_rate[20]; 254 __le16 gcpd_per_rate[20];
255 __le16 sifs_tx_11n;
256 __le16 sifs_tx_11b;
257 __le16 slot_rx_11n;
258 __le16 ofdm_ack_tout;
259 __le16 cck_ack_tout;
260 __le16 preamble_type;
246} __packed; 261} __packed;
247 262
248static inline u32 rsi_get_queueno(u8 *addr, u16 offset) 263static inline u32 rsi_get_queueno(u8 *addr, u16 offset)