aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorHante Meuleman <hante.meuleman@broadcom.com>2016-09-19 07:09:59 -0400
committerKalle Valo <kvalo@codeaurora.org>2016-09-26 13:35:56 -0400
commit92c313604711a0976def79dabb9e8da3cc2cc780 (patch)
treeefd1fc2bb986e2cbc18e7a3e6a44ec61ed7d3b66 /drivers/net
parenta7ed7828ecda0c2b5e0d7f55dedd4230afd4b583 (diff)
brcmfmac: simplify mapping of auth type
The 802.11 standard only has four valid auth type configurations of which our firmware only supports two, ie. Open System and Shared Key. Simplify the mapping falling back to automatic for other types specified by user-space. Reviewed-by: Arend Van Spriel <arend.vanspriel@broadcom.com> Reviewed-by: Franky Lin <franky.lin@broadcom.com> Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com> Signed-off-by: Hante Meuleman <hante.meuleman@broadcom.com> Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index d97d6b153d6a..6aeb69cb29b6 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -1595,15 +1595,9 @@ static s32 brcmf_set_auth_type(struct net_device *ndev,
1595 val = 1; 1595 val = 1;
1596 brcmf_dbg(CONN, "shared key\n"); 1596 brcmf_dbg(CONN, "shared key\n");
1597 break; 1597 break;
1598 case NL80211_AUTHTYPE_AUTOMATIC:
1599 val = 2;
1600 brcmf_dbg(CONN, "automatic\n");
1601 break;
1602 case NL80211_AUTHTYPE_NETWORK_EAP:
1603 brcmf_dbg(CONN, "network eap\n");
1604 default: 1598 default:
1605 val = 2; 1599 val = 2;
1606 brcmf_err("invalid auth type (%d)\n", sme->auth_type); 1600 brcmf_dbg(CONN, "automatic, auth type (%d)\n", sme->auth_type);
1607 break; 1601 break;
1608 } 1602 }
1609 1603