[PATCH 3.16 01/10] Revert "brcmfmac: assure SSID length from firmware is limited"

[Ben Hutchings]

3.16.67-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: Ben Hutchings <b...@decadent.org.uk>

This reverts commit 9657f3abd17772d3290a3545dfb4811d945e84e1, which
was similar to commit 1b5e2423164b3670e8bc9174e4762d297990deff
upstream.  The function fixed upstream doesn't exist in 3.16 and the
similar bug that does exist here needs a different fix.

Signed-off-by: Ben Hutchings <b...@decadent.org.uk>
---
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -3082,8 +3082,6 @@ brcmf_notify_sched_scan_results(struct b
 
                        brcmf_dbg(SCAN, "SSID:%s Channel:%d\n",
                                  netinfo->SSID, netinfo->channel);
-                       if (netinfo->SSID_len > IEEE80211_MAX_SSID_LEN)
-                               netinfo->SSID_len = IEEE80211_MAX_SSID_LEN;
                        memcpy(ssid[i].ssid, netinfo->SSID, netinfo->SSID_len);
                        ssid[i].ssid_len = netinfo->SSID_len;
                        request->n_ssids++;