From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8881B35C686; Tue, 21 Jul 2026 21:18:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784668727; cv=none; b=BIKjM+Ww/kwOIFQn7NOWFSikpnW0tSRMneC/ROpuTjnj9d+0AqlaKs8c88THGnYjZVmfG3Qcpmnk0A+SQo5fclSnnsFZ8bXFiPf71aZoyfiwGCN2PA8VHUjAVVPaPUB79np+VyzV6yTYlYYSM4BDjVKT+VGxJYtaQNUim7Suxic= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784668727; c=relaxed/simple; bh=bt3hCswXpp8xG77nFDMlHHqz+U3XHo5xi74MBsYZ/OA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DhyoVa8aDQCbqiKNuHw0dt0HI37bET2vMR3gGw5nIjJnFBw4Bf00Xma+g7stH5l4xIvf34ASsctqm3BcKm3A/ocD9PgsDQaObF0sTfg57plDIfwhS754vdUCopJnwFtl48k1N//QCAdUaKC6NGWr4zngaTCD+ZyXY7ZFDiDy7jc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=nNXd394X; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="nNXd394X" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E12151F00A3A; Tue, 21 Jul 2026 21:18:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784668726; bh=axlWFwWMue9hW8o/Z08p+Rs6uuaZTZ58rSXpWbYAOd8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=nNXd394XWWwBalgB+eeObVU8cKEOYFeM/Nfe20+NQPZF1QoWqWbGWJ8u0Exqp8z5y AQwR+9Umx/BQ6+M6Uh2RZWKucb1ZWBcgzXDUhaSLPeJ806kY5WpE00hbTHP+IKkLrV E1tSd339XUvsei9CGavPmYMF6NOMElarzLaNmCnE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Louis Kotze , Johannes Berg , Sasha Levin Subject: [PATCH 6.1 0283/1067] wifi: cfg80211: fix grammar in MLO group key error message Date: Tue, 21 Jul 2026 17:14:44 +0200 Message-ID: <20260721152430.932146401@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152424.521567757@linuxfoundation.org> References: <20260721152424.521567757@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Louis Kotze [ Upstream commit 9dcc1af3bbf5441f71a1e51b8d81bdf38a249607 ] The error message emitted by nl80211_validate_key_link_id() when a group key install on an MLO wdev is missing the link ID reads "link ID must for MLO group key", which is missing the words "be set". This makes the error harder to grep and parse in userspace logs, and is reported verbatim by wpa_supplicant via its nl80211 extack relay, e.g.: wpa_supplicant: nl80211: kernel reports: link ID must for MLO group key The sibling error strings in the same helper already use grammatical phrasing ("link ID not allowed for pairwise key", "invalid link ID for MLO group key", "link ID not allowed for non-MLO group key"). Fix this one to match. No functional change. Fixes: e7a7b84e3317 ("wifi: cfg80211: Add link_id parameter to various key operations for MLO") Signed-off-by: Louis Kotze Link: https://patch.msgid.link/20260414122728.92234-1-loukot@gmail.com Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/wireless/nl80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 9c8306fbb4e45d..36a7b9707eabd2 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -4435,7 +4435,7 @@ static int nl80211_validate_key_link_id(struct genl_info *info, if (wdev->valid_links) { if (link_id == -1) { GENL_SET_ERR_MSG(info, - "link ID must for MLO group key"); + "link ID must be set for MLO group key"); return -EINVAL; } if (!(wdev->valid_links & BIT(link_id))) { -- 2.53.0