brcmfmac: fix incorrect error prints
authorJames Prestwood <prestwoj@gmail.com>
Wed, 1 Sep 2021 19:06:41 +0000 (12:06 -0700)
committerKalle Valo <kvalo@codeaurora.org>
Tue, 21 Sep 2021 05:56:58 +0000 (08:56 +0300)
An unsupported AKM would end up printing "invalid cipher group". Instead
print "invalid akm suite" with the offending AKM.

Signed-off-by: James Prestwood <prestwoj@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210901190641.255624-1-prestwoj@gmail.com
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

index f7b96cd..6e96188 100644 (file)
@@ -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;
                }
        }