wl12xx: use wiphy values for setting rts, frag thresholds on init

Use the wiphy RTS and fragmentation thresholds for initializing the FW
when possible. This mitigates a bug where previously set values are
forgotten after interface down/up.

Add checks before settings these values to ensure they are valid. Use
default values when invalid thresholds are configured.

Update the default RTS threshold to the maximum value given by the
specification.

Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 5f8bb35c6475..81a0c8ed5a4a 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -163,7 +163,7 @@ static struct conf_drv_settings default_conf = {
                 .packet_detection_threshold  = 0,
                 .ps_poll_timeout             = 15,
                 .upsd_timeout                = 15,
-                .rts_threshold               = 2347,
+                .rts_threshold               = IEEE80211_MAX_RTS_THRESHOLD,
                 .rx_cca_threshold            = 0,
                 .irq_blk_threshold           = 0xFFFF,
                 .irq_pkt_threshold           = 0,
@@ -2360,7 +2360,7 @@ static int wl1271_op_set_frag_threshold(struct ieee80211_hw *hw, u32 value)
         if (ret < 0)
                 goto out;
 
-        ret = wl1271_acx_frag_threshold(wl, (u16)value);
+        ret = wl1271_acx_frag_threshold(wl, value);
         if (ret < 0)
                 wl1271_warning("wl1271_op_set_frag_threshold failed: %d", ret);
 
@@ -2388,7 +2388,7 @@ static int wl1271_op_set_rts_threshold(struct ieee80211_hw *hw, u32 value)
         if (ret < 0)
                 goto out;
 
-        ret = wl1271_acx_rts_threshold(wl, (u16) value);
+        ret = wl1271_acx_rts_threshold(wl, value);
         if (ret < 0)
                 wl1271_warning("wl1271_op_set_rts_threshold failed: %d", ret);