diff options
author | Ido Reis <idor@ti.com> | 2012-02-02 06:54:27 -0500 |
---|---|---|
committer | Luciano Coelho <coelho@ti.com> | 2012-02-15 01:38:35 -0500 |
commit | c08e371a683021cfb99632db799bea9b69d176e5 (patch) | |
tree | 91409aa42a5a195a286fb2c804ac1f2af3ffac0a /drivers/net/wireless/wl12xx | |
parent | 35d7742ff31609d655f8f8b3f869647006a2ac26 (diff) |
wl12xx: increase max probe-req template size to WL1271_CMD_TEMPL_MAX_SIZE
Increase max scan IEs to allow big probe-req frames
Report a correct max-length for the scan IEs we can support, according
to the now larger size of the probe-req template.
Signed-off-by: Ido Reis <idor@ti.com>
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx')
-rw-r--r-- | drivers/net/wireless/wl12xx/init.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/wl12xx/init.c b/drivers/net/wireless/wl12xx/init.c index acc03799fc66..203fbebf09eb 100644 --- a/drivers/net/wireless/wl12xx/init.c +++ b/drivers/net/wireless/wl12xx/init.c | |||
@@ -42,14 +42,14 @@ int wl1271_init_templates_config(struct wl1271 *wl) | |||
42 | /* send empty templates for fw memory reservation */ | 42 | /* send empty templates for fw memory reservation */ |
43 | ret = wl1271_cmd_template_set(wl, WL12XX_INVALID_ROLE_ID, | 43 | ret = wl1271_cmd_template_set(wl, WL12XX_INVALID_ROLE_ID, |
44 | CMD_TEMPL_CFG_PROBE_REQ_2_4, NULL, | 44 | CMD_TEMPL_CFG_PROBE_REQ_2_4, NULL, |
45 | WL1271_CMD_TEMPL_DFLT_SIZE, | 45 | WL1271_CMD_TEMPL_MAX_SIZE, |
46 | 0, WL1271_RATE_AUTOMATIC); | 46 | 0, WL1271_RATE_AUTOMATIC); |
47 | if (ret < 0) | 47 | if (ret < 0) |
48 | return ret; | 48 | return ret; |
49 | 49 | ||
50 | ret = wl1271_cmd_template_set(wl, WL12XX_INVALID_ROLE_ID, | 50 | ret = wl1271_cmd_template_set(wl, WL12XX_INVALID_ROLE_ID, |
51 | CMD_TEMPL_CFG_PROBE_REQ_5, | 51 | CMD_TEMPL_CFG_PROBE_REQ_5, |
52 | NULL, WL1271_CMD_TEMPL_DFLT_SIZE, 0, | 52 | NULL, WL1271_CMD_TEMPL_MAX_SIZE, 0, |
53 | WL1271_RATE_AUTOMATIC); | 53 | WL1271_RATE_AUTOMATIC); |
54 | if (ret < 0) | 54 | if (ret < 0) |
55 | return ret; | 55 | return ret; |
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index 17dcd63bfc48..253847ff344b 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c | |||
@@ -5063,10 +5063,10 @@ static int wl1271_init_ieee80211(struct wl1271 *wl) | |||
5063 | * should be the maximum length possible for a template, without | 5063 | * should be the maximum length possible for a template, without |
5064 | * the IEEE80211 header of the template | 5064 | * the IEEE80211 header of the template |
5065 | */ | 5065 | */ |
5066 | wl->hw->wiphy->max_scan_ie_len = WL1271_CMD_TEMPL_DFLT_SIZE - | 5066 | wl->hw->wiphy->max_scan_ie_len = WL1271_CMD_TEMPL_MAX_SIZE - |
5067 | sizeof(struct ieee80211_header); | 5067 | sizeof(struct ieee80211_header); |
5068 | 5068 | ||
5069 | wl->hw->wiphy->max_sched_scan_ie_len = WL1271_CMD_TEMPL_DFLT_SIZE - | 5069 | wl->hw->wiphy->max_sched_scan_ie_len = WL1271_CMD_TEMPL_MAX_SIZE - |
5070 | sizeof(struct ieee80211_header); | 5070 | sizeof(struct ieee80211_header); |
5071 | 5071 | ||
5072 | wl->hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD; | 5072 | wl->hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD; |