From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f178.google.com (mail-yw1-f178.google.com [209.85.128.178]) (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 E58B93314C2 for ; Mon, 6 Apr 2026 23:43:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775518993; cv=none; b=mXmerIWV7v3h2WUA722cU545K2s7fzY0Wle7L0TQ4OJAAg01CvCtsPWRwTojWOfWbCTrYSSc9tJISWfK2420I3FWApNeNss73I31o6DpbySBHzvYJhVtuD5SP04YSvOVTc+jplR0uCWTkfrV712EXQOKS8F2tiyZNLd8XDP+Q1I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775518993; c=relaxed/simple; bh=5AFQSaFmab0W60GDHchwkX6lsxFVStzDQSBUV0l8xYw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QOJIxm6MipBg5y3hL+aBYvKizw7SqnAC9QEPfCKcJJngRsatP798ZnpMvBhEFlBYpbmYk/eCVhRzRxGUlXbSyiV7fb6XM6p8W+ybh/rya1Dr91Vk+280jZpZBjCWRuwVrOcT5Ne/V9VbCEdynsowyS7XWxqzHZcJtddVhoKx+14= 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=MNJkitIb; arc=none smtp.client-ip=209.85.128.178 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="MNJkitIb" Received: by mail-yw1-f178.google.com with SMTP id 00721157ae682-794719afcd4so41836797b3.1 for ; Mon, 06 Apr 2026 16:43:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775518991; x=1776123791; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XhhW2JtmFLuaeAr//pW9N+0QVOgFVlmDgosFHmJ4lDI=; b=MNJkitIbQPwTE7KE87sBkEbywAsqEbNN4ixjlHRGqEI7SoFYtl0PUmwAgXmX8L1L/3 gEPvr0Ep9MwyQkLSHkIELkdw76xcIDDqBpIYZDwawOAwq7NGtjL35Ls/pDPSBcY/yNe5 gxo0YVaQky2i3tQir7lOhdfR/psTbRe4O6N0mbbGcr/X+eSvJR0NZZKIgKt2o6uko6UJ 3Matr5juqyhcBP6ExBmOF/fEj0sUZSxgy6y+qCIDdCmUUS8gqy4Vbf2gnDBTFGZEklRr /DuIEtcVjYOAae+b/Pv2mu1Ha6gn++5WB3vAsFaTVnp7JfwwizySNPBh2JteF/qY5/ad ORgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775518991; x=1776123791; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=XhhW2JtmFLuaeAr//pW9N+0QVOgFVlmDgosFHmJ4lDI=; b=sEsiHmWWO2Y2oMzh/Fnj08iiskMCpRNkf4+X+GXR/kY5wOlS6YeWeKB8Uw/g+EIA2y XVRQFl/8kFGjMVGzIyveuLiLkeRluHBNrW2KS/ymQ2Cu7qa2LUksh1yWRgcxxnAluSqi 3CQVrbExu5Rr9OqIY8wsE93WMdm7WHaPefgFZONoYrlA3QpvsoSvKil3puvWslduExmf N1W/kGGRrK9SVqkHHc7sMuGHw2oZT0+PHjS3JMB0WVzhgbFyKvJJUmmLJ9MztzkRVG2M BJ2rMpxCi9TXE/lE5ZuCSqH/bCgo7CEK+elCrV4sLtAqpPu9mJVPFO+AqXAS2cUhwgRe oVDA== X-Gm-Message-State: AOJu0YycoFMxK0nNDYrLHNjbPdYfpb8sVZiyHctcgWwk/habRyWxA2QG rPzrkF/0i/Rgay0y4nzlGstsj/p0/w3evtd1O+k1U4U2Y9Ujlr79ktu4cPs0Euki X-Gm-Gg: AeBDiev0cIWjehExe6zs8k73s155LHoEIIEIOeGMHW3Ve7M6FMPTSLwg/U7SKet1Taf UsaQpR0yEH9572Lix4H3G40ZrF8BoZpJ76/XjpEN7S+5rumwUjdq5hpGGo14uqT2HShZLEasS/f 88+Ha+v0ACkkGsSoAw72PhVIYt/ioSnJuDtBK4HN2wK8qVrba0LU5IHu8VTEjLg61D+O9Q3WUqv aXcfrCYONh3YUHWvgqdVK/CK//ouQAtqlDb1/5wLJ2lw4ATsdrnHE4BGXrsX+aTeIh17sjtc4Aq 4n+Ix4J9JR8fJ/Zs/gJ0tk6BEmaF3hyVLuScKEAM4Yw4KEmKUrh9tW9WybQyp6lsaBdI55KVN8e SGAoN8K3rDsTndELoTNlEs+vvpsuew9llf3vfXSMsl6pOevM81wqdj9vITM1vkfUmcMooFjUI4s sMpRJzIVECajQO+mu3utWrPwmoTL6gUUbV9k+yDoWwGL1fh0dKdj+BYL0Rh6Xc X-Received: by 2002:a05:690c:e3ef:b0:79d:bb7:54da with SMTP id 00721157ae682-7a4d5d540bbmr156205827b3.41.1775518990749; Mon, 06 Apr 2026 16:43:10 -0700 (PDT) Received: from DEV.lan (c-75-74-152-49.hsd1.fl.comcast.net. [75.74.152.49]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7a370df16aasm59144037b3.40.2026.04.06.16.43.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2026 16:43:10 -0700 (PDT) From: Joshua Klinesmith To: linux-wireless@vger.kernel.org Cc: nbd@nbd.name, lorenzo@kernel.org, ryder.lee@mediatek.com, shayne.chen@mediatek.com, sean.wang@mediatek.com, linux-kernel@vger.kernel.org, Joshua Klinesmith , stable@vger.kernel.org Subject: [PATCH wireless 1/2] wifi: mt76: mt7915: clear cipher state on key removal for WED offload Date: Mon, 6 Apr 2026 19:42:03 -0400 Message-ID: <20260406234205.29857-2-joshuaklinesmith@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260406234205.29857-1-joshuaklinesmith@gmail.com> References: <20260406234205.29857-1-joshuaklinesmith@gmail.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit When switching from WPA-PSK/SAE to open/no encryption, the DISABLE_KEY path never resets mvif->mt76.cipher back to zero. The stale cipher value is sent to the WA firmware via BSS_INFO updates, causing the firmware to keep the protection bit set on WED-offloaded packets. The hardware then drops all plaintext frames, resulting in zero throughput. Reset mvif->mt76.cipher to zero and notify the firmware via mt7915_mcu_add_bss_info() when the last group key is removed. Fixes: 3fd2dbd6a1d3 ("mt76: mt7915: update bss_info with cipher after setting the group key") Cc: stable@vger.kernel.org Signed-off-by: Joshua Klinesmith --- drivers/net/wireless/mediatek/mt76/mt7915/main.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c index fe0639c14b..8d32729a58 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c @@ -414,7 +414,11 @@ static int mt7915_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, } else { if (idx == *wcid_keyidx) *wcid_keyidx = -1; - goto out; + + if (!sta && mvif->mt76.cipher) { + mvif->mt76.cipher = 0; + mt7915_mcu_add_bss_info(phy, vif, true); + } } mt76_wcid_key_setup(&dev->mt76, wcid, key); @@ -486,10 +490,6 @@ static int mt7915_config(struct ieee80211_hw *hw, int radio_idx, if (!enabled) { rxfilter |= MT_WF_RFCR_DROP_OTHER_UC; dev->monitor_mask &= ~BIT(band); - } else { - rxfilter &= ~MT_WF_RFCR_DROP_OTHER_UC; - dev->monitor_mask |= BIT(band); - } mt76_rmw_field(dev, MT_DMA_DCR0(band), MT_DMA_DCR0_RXD_G5_EN, enabled); @@ -1166,10 +1166,6 @@ static void mt7915_sta_statistics(struct ieee80211_hw *hw, if (txrate->legacy || txrate->flags) { if (txrate->legacy) { sinfo->txrate.legacy = txrate->legacy; - } else { - sinfo->txrate.mcs = txrate->mcs; - sinfo->txrate.nss = txrate->nss; - sinfo->txrate.bw = txrate->bw; sinfo->txrate.he_gi = txrate->he_gi; sinfo->txrate.he_dcm = txrate->he_dcm; sinfo->txrate.he_ru_alloc = txrate->he_ru_alloc; -- 2.43.0