Skip to contentSkip to conversation

brcmfmac: fix incorrect error prints

PATCH In review James Prestwood 2 participants 2 messages Sep 1, 2021 – Sep 21, 2021 Broadcom BRCM80211 IEEE802.11 wireless drivers

lore
Share & tools
lore

James Prestwood

author
#0 lore raw

PATCH 1/1 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 James Prestwood <[email protected]>
---
 .../wireless/broadcom/brcm80211/brcmfmac/cfg80211.c  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +6 -6
index f4405d7861b6..34d3d2d198de 100644
@@ -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) {

@@ -1830,8 +1830,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;
 		}
 	}
Signature · 1 line
2.31.1
#1 lore raw
Quoted 4 lines · James Prestwood

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

Signed-off-by James Prestwood <[email protected]>

Patch applied to wireless-drivers-next.git, thanks.

beca6bd94da5 brcmfmac: fix incorrect error prints

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches