From nobody Tue Nov 11 11:30:28 2025 Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B5A20284884 for ; Tue, 11 Nov 2025 07:33:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762846406; cv=none; b=Nh+NpTK8Ycj4yaDTjNYAumXgIctZUQtsL5QXgmdxPIWn7HHbsJYZS5UE98YBxDyHEeFjDROmutVT/iZHs3oc55tE7YOSWoKJrgobouXXehSi9WxRl8HHsB7qiBpzxAK+BQSflfs5XWriRFwi/tRH4reTMxUH+v9QDRwVxeHE1sg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762846406; c=relaxed/simple; bh=uZalZPFf4jKIPWqXzV7tu+QzbWPg0yTTEsdMmEW6Ybo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=cDH0xS+ivacDyYeaf1KU6Pnwsydl9c4IV8WLjWdQX4r64KhqQG4I2m02TrUidVwh8gYQ8qygg/cOjbHMx6y2ByYZwKAldCcrn/n1LtWtAD6Oyx5hLn4EcKoeGlB+2MXxOkcv8++sydOQUjPMXIJxp8ee+IQo6ruZd7oauwIVcsk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ZSR3Fvtj; arc=none smtp.client-ip=209.85.208.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZSR3Fvtj" Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-64166a57f3bso3516406a12.1 for ; Mon, 10 Nov 2025 23:33:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762846403; x=1763451203; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=EW/edEVU0KV0TxqzuoUgBBiWmv1nZ1ujjQOOdZz8lu4=; b=ZSR3FvtjaMsc2rJ/BOm5GenpSu165JBSirzTUos8ktjq1CW0umWuhqYr5XbLFxCbV7 2/Wk0IPwJyyvNoz/Fd7xezolkhEs9dqfkc3teWEJlbFddD4vgvobA+VWUoYhbLL1YDr1 pEnAcvAjf3zVFkWWjIw0YZEgos3gN3wZfggY2ycLmQ2TETRqO6RTMQX22h/rXkRNbj1R UfPkq0G6a7PU59WMLWkV4ZEOFb6x8P6Rc/Z0n8P+AEf6CdxQypVFe/oQujOhGG+93p9n 2DWIh+9C6O01YmiweHWyGckgVEO9fq7Xh7Aw3sPs3FdBtkjvosCoMKWkgQtk+pl2hAxe pDRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762846403; x=1763451203; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=EW/edEVU0KV0TxqzuoUgBBiWmv1nZ1ujjQOOdZz8lu4=; b=Kj/PKJ6QKOKUw5N/H+SwvZJjrYm1J1jKZYV9xm74RT5xOO0QiZGeCGBd+bO9jep7Eu 6w2lrMlQbxJSbPbzPyKvTYYHRpqWghbyUfHlnituwWX5HuBA2D1YauLwnTotuCCHRbZV mtbeZo6dSmuM/E3v4UFKnSGVKmJVDlqlcr+4CtitcbvQS74iKF3DsjoSfdEVYezAaoVX u2o94EUmAYBrG9cUzwBmiuA7Cq+oD6t2BggGN2vcvPJ1Ekbjunsc14BOmyUwagzFAymL 2DO7RKDVk72ZKYwReiQ+22IknrJFoDSIsgpupbDRwo1k0wfWRF/96R1LPhKsYI5Bgkrx gn5g== X-Forwarded-Encrypted: i=1; AJvYcCVsMOXW6SBdT7D54wIRcHbMIgNdknfhYY/TDPMtUbRcg8nRou5uBMQ9uoBkIOS/c+NuqMb8MMVyHODpmaI=@vger.kernel.org X-Gm-Message-State: AOJu0YwPoJAIfzcfw+aZZnu+jowCUFjsQVzjdGacabZHvAve1KY8SmrI Wr+QKFT48hjQ6rOiv4zaEjIbTssuxVcPedIbwItbwS4dfnOQxoU3I60M X-Gm-Gg: ASbGncuLDwnSbM/qo/Ki569T0aL7iWsdiYtYK2Gz9oOehmS+q5FJp0xWJiEneXXDyp1 otIpa2HZNpQ0q313qTawt9CUOS6sZMcLnxkC8N8CKjJEQ5wrZUratDnyWFSeYFKX6p1jy2FwwYi 8h7J5Mcp9y7It6ciKGeUg0u2yxxqc74dU3Yp0cO7UXA49HQWicvf6ABcOnngR6GdHsk3L9arjAy Hfd2Jjg09C5MD0wkIdPTQLwKwdHWnSdjr7Q9DYpXVsYZSYzad3u4Nb+bvMQHdNhRFLkds6fJekN LE3OPKveBHv0ICT0nElsYFypjO7vlAtIwlN3Qr3iSzY90z2k8li0H6ai8F1lrE2qQZccCNT0lAx 2zRKyrFn5zJWfHdz8uMkVp4UHrpjV8pPX3vTQQcN0muvUb5+3lcmyGUF+Iu0EK4rtLMqVAN40wq rEdW6/oeBo/+uaLbkwDINgGnoYcldNEfsqY4wXrQ== X-Google-Smtp-Source: AGHT+IH5UdRGX9vHEpYaWlX4gzbeYljFwAVzWxu+8ZPZ6DiGRR+OVPwGcszNxy/8+pt2DPBl/RIPvg== X-Received: by 2002:a05:6402:21c2:b0:640:b044:d9bd with SMTP id 4fb4d7f45d1cf-6415e7fd427mr8009190a12.29.1762846402832; Mon, 10 Nov 2025 23:33:22 -0800 (PST) Received: from tempest2.wbe.local (xt27d7.stansat.pl. [83.243.39.215]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6416001a4a8sm8122499a12.15.2025.11.10.23.33.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Nov 2025 23:33:22 -0800 (PST) From: Pawel Dembicki To: linux-wireless@vger.kernel.org Cc: Pawel Dembicki , Antony Kolitsos , Johannes Berg , Thomas Fourier , Roopni Devanathan , linux-kernel@vger.kernel.org Subject: [PATCH v2] wifi: mwl8k: inject DSSS Parameter Set element into beacons if missing Date: Tue, 11 Nov 2025 08:31:16 +0100 Message-ID: <20251111073134.2774120-2-paweldembicki@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Some Marvell AP firmware used with mwl8k misbehaves when beacon frames do not contain a WLAN_EID_DS_PARAMS element with the current channel. It was reported on OpenWrt Github issues [0]. When hostapd/mac80211 omits DSSS Parameter Set from the beacon (which is valid on some bands), the firmware stops transmitting sane frames and RX status starts reporting bogus channel information. This makes AP mode unusable. Newer Marvell drivers (mwlwifi [1]) hard-code DSSS Parameter Set into AP beacons for all chips, which suggests this is a firmware requirement rather than a mwl8k-specific quirk. Mirror that behaviour in mwl8k: when setting the beacon, check if WLAN_EID_DS_PARAMS is present, and if not, extend the beacon and inject a DSSS Parameter Set element, using the current channel from hw->conf.chandef.chan. Tested on Linksys EA4500 (88W8366). [0] https://github.com/openwrt/openwrt/issues/19088 [1] https://github.com/kaloz/mwlwifi/blob/db97edf20fadea2617805006f5230665f= adc6a8c/hif/fwcmd.c#L675 Tested-by: Antony Kolitsos Signed-off-by: Pawel Dembicki --- V2: - added "wifi:" prefix to commit title - renamed "DS Params" -> "DSSS Parameter Set" - Insert WLAN_EID_DS_PARAMS after WLAN_EID_SSID, WLAN_EID_SUPP_RATES and WLAN_EID_EXT_SUPP_RATES --- drivers/net/wireless/marvell/mwl8k.c | 71 ++++++++++++++++++++++++++-- 1 file changed, 66 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/marvell/mwl8k.c b/drivers/net/wireless/ma= rvell/mwl8k.c index 891e125ad30b..914a566d700a 100644 --- a/drivers/net/wireless/marvell/mwl8k.c +++ b/drivers/net/wireless/marvell/mwl8k.c @@ -2966,6 +2966,52 @@ mwl8k_cmd_rf_antenna(struct ieee80211_hw *hw, int an= tenna, int mask) /* * CMD_SET_BEACON. */ + +static bool mwl8k_beacon_has_ds_params(const u8 *buf, int len) +{ + const struct ieee80211_mgmt *mgmt =3D (const void *)buf; + int ies_len; + + if (len <=3D offsetof(struct ieee80211_mgmt, u.beacon.variable)) + return false; + + ies_len =3D len - offsetof(struct ieee80211_mgmt, u.beacon.variable); + + return cfg80211_find_ie(WLAN_EID_DS_PARAMS, mgmt->u.beacon.variable, + ies_len) !=3D NULL; +} + +static void mwl8k_beacon_copy_inject_ds_params(struct ieee80211_hw *hw, + u8 *buf_dst, const u8 *buf_src, + int src_len) +{ + const struct ieee80211_mgmt *mgmt =3D (const void *)buf_src; + static const u8 before_ds_params[] =3D { + WLAN_EID_SSID, + WLAN_EID_SUPP_RATES, + WLAN_EID_EXT_SUPP_RATES, + }; + const u8 *ies; + int hdr_len, left, offs, pos; + + ies =3D mgmt->u.beacon.variable; + hdr_len =3D offsetof(struct ieee80211_mgmt, u.beacon.variable); + + offs =3D ieee80211_ie_split(ies, src_len - hdr_len, before_ds_params, + ARRAY_SIZE(before_ds_params), 0); + + pos =3D hdr_len + offs; + left =3D src_len - pos; + + memcpy(buf_dst, buf_src, pos); + + /* Inject a DSSS Parameter Set after SSID + (Ext) Supp Rates */ + buf_dst[pos + 0] =3D WLAN_EID_DS_PARAMS; + buf_dst[pos + 1] =3D 1; + buf_dst[pos + 2] =3D hw->conf.chandef.chan->hw_value; + + memcpy(buf_dst + pos + 3, buf_src + pos, left); +} struct mwl8k_cmd_set_beacon { struct mwl8k_cmd_pkt_hdr header; __le16 beacon_len; @@ -2975,17 +3021,32 @@ struct mwl8k_cmd_set_beacon { static int mwl8k_cmd_set_beacon(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u8 *beacon, int len) { + bool ds_params_present =3D mwl8k_beacon_has_ds_params(beacon, len); struct mwl8k_cmd_set_beacon *cmd; - int rc; + int rc, final_len =3D len; =20 - cmd =3D kzalloc(sizeof(*cmd) + len, GFP_KERNEL); + if (!ds_params_present) + /* + * mwl8k firmware requires a DS Params IE with the current + * channel in AP beacons. If mac80211/hostapd does not + * include it, inject one here. IE ID + length + channel + * number =3D 3 bytes. + */ + final_len +=3D 3; + + cmd =3D kzalloc(sizeof(*cmd) + final_len, GFP_KERNEL); if (cmd =3D=3D NULL) return -ENOMEM; =20 cmd->header.code =3D cpu_to_le16(MWL8K_CMD_SET_BEACON); - cmd->header.length =3D cpu_to_le16(sizeof(*cmd) + len); - cmd->beacon_len =3D cpu_to_le16(len); - memcpy(cmd->beacon, beacon, len); + cmd->header.length =3D cpu_to_le16(sizeof(*cmd) + final_len); + cmd->beacon_len =3D cpu_to_le16(final_len); + + if (ds_params_present) + memcpy(cmd->beacon, beacon, len); + else + mwl8k_beacon_copy_inject_ds_params(hw, cmd->beacon, beacon, + len); =20 rc =3D mwl8k_post_pervif_cmd(hw, vif, &cmd->header); kfree(cmd); --=20 2.34.1