diff options
author | Jahnavi Meher <jahnavi.meher@gmail.com> | 2014-06-16 10:13:54 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-06-19 15:49:22 -0400 |
commit | 2bfa6969d9b332ce43d03d679bf178ecb19b23c0 (patch) | |
tree | 8abde4d1a608fae10fc0a4347b7ce509ca363af9 | |
parent | be876b299e12bae2b38cba3f48324fe5913a250b (diff) |
rsi: Use SGI if configured for fixed rate transmission.
Use SGI if configured while sending data packets at a fixed rate.
Signed-off-by: Jahnavi Meher <jahnavi.meher@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/rsi/rsi_91x_pkt.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/rsi/rsi_mgmt.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/rsi/rsi_91x_pkt.c b/drivers/net/wireless/rsi/rsi_91x_pkt.c index 8e48e72bae20..229ef3aeaaaf 100644 --- a/drivers/net/wireless/rsi/rsi_91x_pkt.c +++ b/drivers/net/wireless/rsi/rsi_91x_pkt.c | |||
@@ -81,6 +81,12 @@ int rsi_send_data_pkt(struct rsi_common *common, struct sk_buff *skb) | |||
81 | /* Send fixed rate */ | 81 | /* Send fixed rate */ |
82 | frame_desc[3] = cpu_to_le16(RATE_INFO_ENABLE); | 82 | frame_desc[3] = cpu_to_le16(RATE_INFO_ENABLE); |
83 | frame_desc[4] = cpu_to_le16(common->min_rate); | 83 | frame_desc[4] = cpu_to_le16(common->min_rate); |
84 | if (common->vif_info[0].sgi) { | ||
85 | if (common->min_rate & 0x100) /* Only MCS rates */ | ||
86 | frame_desc[4] |= | ||
87 | cpu_to_le16(ENABLE_SHORTGI_RATE); | ||
88 | } | ||
89 | |||
84 | } | 90 | } |
85 | 91 | ||
86 | frame_desc[6] |= cpu_to_le16(seq_num & 0xfff); | 92 | frame_desc[6] |= cpu_to_le16(seq_num & 0xfff); |
diff --git a/drivers/net/wireless/rsi/rsi_mgmt.h b/drivers/net/wireless/rsi/rsi_mgmt.h index 6ccf9d935e4b..8bff6640dd10 100644 --- a/drivers/net/wireless/rsi/rsi_mgmt.h +++ b/drivers/net/wireless/rsi/rsi_mgmt.h | |||
@@ -69,6 +69,7 @@ | |||
69 | 69 | ||
70 | #define RSI_LMAC_CLOCK_80MHZ 0x1 | 70 | #define RSI_LMAC_CLOCK_80MHZ 0x1 |
71 | #define RSI_ENABLE_40MHZ (0x1 << 3) | 71 | #define RSI_ENABLE_40MHZ (0x1 << 3) |
72 | #define ENABLE_SHORTGI_RATE BIT(9) | ||
72 | 73 | ||
73 | #define RX_BA_INDICATION 1 | 74 | #define RX_BA_INDICATION 1 |
74 | #define RSI_TBL_SZ 40 | 75 | #define RSI_TBL_SZ 40 |