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 <[email protected]>
Reviewed-by: Franky Lin <[email protected]>
Reviewed-by: Pieter-Paul Giesberts <[email protected]>
Signed-off-by: Hante Meuleman <[email protected]>
Signed-off-by: Arend van Spriel <[email protected]>
Signed-off-by: Kalle Valo <[email protected]>

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index d97d6b153d6a1c5f66d339002b76010c09eafd28..6aeb69cb29b683214b315e72046f24212ed9f3ef 100644 (file)
--- 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,
                val = 1;
                brcmf_dbg(CONN, "shared key\n");
                break;
-       case NL80211_AUTHTYPE_AUTOMATIC:
-               val = 2;
-               brcmf_dbg(CONN, "automatic\n");
-               break;
-       case NL80211_AUTHTYPE_NETWORK_EAP:
-               brcmf_dbg(CONN, "network eap\n");
        default:
                val = 2;
-               brcmf_err("invalid auth type (%d)\n", sme->auth_type);
+               brcmf_dbg(CONN, "automatic, auth type (%d)\n", sme->auth_type);
                break;
        }