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>

diff --git a/drivers/net/wireless/rsi/rsi_91x_pkt.c b/drivers/net/wireless/rsi/rsi_91x_pkt.c
index 8e48e72bae204ae0410d40743fe6e00fe918fe1f..229ef3aeaaaf2e03dbd40b7adafb3020336d76f6 100644 (file)
--- 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)
                /* Send fixed rate */
                frame_desc[3] = cpu_to_le16(RATE_INFO_ENABLE);
                frame_desc[4] = cpu_to_le16(common->min_rate);
+               if (common->vif_info[0].sgi) {
+                       if (common->min_rate & 0x100) /* Only MCS rates */
+                               frame_desc[4] |=
+                                       cpu_to_le16(ENABLE_SHORTGI_RATE);
+               }
+
        }
 
        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 6ccf9d935e4b338a9d246f947917f29981f1d9de..8bff6640dd10be3ae1aa840da0651898015bfd00 100644 (file)
--- a/drivers/net/wireless/rsi/rsi_mgmt.h
+++ b/drivers/net/wireless/rsi/rsi_mgmt.h
@@ -69,6 +69,7 @@
 
 #define RSI_LMAC_CLOCK_80MHZ            0x1
 #define RSI_ENABLE_40MHZ                (0x1 << 3)
+#define ENABLE_SHORTGI_RATE            BIT(9)
 
 #define RX_BA_INDICATION                1
 #define RSI_TBL_SZ                      40