Commit beca6bd9 authored by James Prestwood's avatar James Prestwood Committed by Kalle Valo
Browse files

brcmfmac: fix incorrect error prints 



An unsupported AKM would end up printing "invalid cipher group". Instead
print "invalid akm suite" with the offending AKM.

Signed-off-by: default avatarJames Prestwood <prestwoj@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210901190641.255624-1-prestwoj@gmail.com
parent b515d097

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

+6 −6
Original line number Diff line number Diff line
@@ -1783,8 +1783,8 @@ brcmf_set_key_mgmt(struct net_device *ndev, struct cfg80211_connect_params *sme) 
			val = WPA_AUTH_PSK;

			break;

		default:

			bphy_err(drvr, "invalid cipher group (%d)\n",

				 sme->crypto.cipher_group);

			bphy_err(drvr, "invalid akm suite (%d)\n",

				 sme->crypto.akm_suites[0]);

			return -EINVAL;

		}

	} else if (val & (WPA2_AUTH_PSK | WPA2_AUTH_UNSPECIFIED)) {
@@ -1816,8 +1816,8 @@ brcmf_set_key_mgmt(struct net_device *ndev, struct cfg80211_connect_params *sme) 
			profile->is_ft = true;

			break;

		default:

			bphy_err(drvr, "invalid cipher group (%d)\n",

				 sme->crypto.cipher_group);

			bphy_err(drvr, "invalid akm suite (%d)\n",

				 sme->crypto.akm_suites[0]);

			return -EINVAL;

		}

	} else if (val & WPA3_AUTH_SAE_PSK) {
@@ -1838,8 +1838,8 @@ brcmf_set_key_mgmt(struct net_device *ndev, struct cfg80211_connect_params *sme) 
			}

			break;

		default:

			bphy_err(drvr, "invalid cipher group (%d)\n",

				 sme->crypto.cipher_group);

			bphy_err(drvr, "invalid akm suite (%d)\n",

				 sme->crypto.akm_suites[0]);

			return -EINVAL;

		}

	}