From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (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 2AE8648A2D7 for ; Wed, 15 Jul 2026 12:50:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119850; cv=none; b=rnfVXTqg8pGeEKOWrvRLAyDNbkhP+DE4im3lI9A6hC847OHM2LMhSbU1eD/mgRq1oEj6zBf1UKM3uGNgr4lMmzaX1DyqwzCCdosiG9izop8efSDFuvF0jC9ey6HZyD3L/UOmab0FbxjLCOJzMwT39JaekKeNfoOlrDKBy4SIyK0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119850; c=relaxed/simple; bh=n6fe+naOVACowWy5NFQ1XJF2gzsEWNhJRUv7gG6UAXg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ENfvREkVevqLS6BVyznnyX3nlC4QwEWXooxS5kHZh31EjbOJ9tp6NDJONgC1hHpc8jGQKXDbJUeCXEzfhe/qX5XYgOtWY7/hzysie+0mi5W1e9zQwVHfapMrlKUjUKU5oQ7HHF4FbUNBuf8fOjDgPyJAk5xNbNQRyUNsFiVP7Pc= 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=jQxShrGm; arc=none smtp.client-ip=209.85.167.54 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="jQxShrGm" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-5b14d1f9315so3760411e87.2 for ; Wed, 15 Jul 2026 05:50:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119844; x=1784724644; 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:content-type; bh=UEcs5vvVq43qJQUckvqztaAgEygqZRuFTmokfHHDOMs=; b=jQxShrGm4FiAPLtv4t7FAJK8hlQpz3Ioz6ybSqO8Mzwt+JLiHw0hsyEfGQou6Z3Z4k V1zbKMYZqoL/sx8pX33s+UKbrDqHl2iz2TNZ52JbeyA+zF92PetR5lSsLewe6rY/8vrw eYSjczDT8uyeqYLE1x92RpWc7D+VtswuOr5XthOsjN+cEusp1lYyj5fqxqWSWUGGZU1l I+PBlx0Cw0mg04sfmQFwVwMCPIrJyXRRGskal6KCsG2xZdTenO/1+AbTND9YCxWqGLhH 5qfAwbe6jqFBGbBZv9yENkIX1cD43eDYWjmroIyqQkbudNgkCQxhYjq4UeROhu6TQF2c 9MpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119844; x=1784724644; 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:content-type; bh=UEcs5vvVq43qJQUckvqztaAgEygqZRuFTmokfHHDOMs=; b=bmFSqM1I7kVT43uSJ4ILu7fTZnbV0+UeqGqbxACJlyVXolT+OvCXyEh68NHw/OIxzS ImNWDcoN9Q+bCkJ4UTq+IBheBMhI+OsF0e+Mdsgc2yus5Zvce4VHsoNG9AtN30TO1PIp NF+rc60P19y/bujQcIXIcnT5Ronq4PykVk8Hn8xc4P8HONWobnIMDMSP6pf32RitraiD pTBNYVyjoUMaY5h3OuK7G/zg8P4FM4WiUXh7KxJuwF2ZplA/8T3i2ZYkZjzcRSqwMHsa j53Jj4mm1jU+7ehOqIzNO8NGWP6Je5vHAV84vuttFcKeUF0ulj1DBbR8uVbseonqFkjM Qzpg== X-Forwarded-Encrypted: i=1; AHgh+RrQILRnbGznjBBjYF2bf70IcrjcVx1sbUI2hnFwV0Feiwp23gC9UZQX+J4bOw97jVm5GPz2fRq3+A7Rl14=@vger.kernel.org X-Gm-Message-State: AOJu0YwJs2lxp56UqJr3TzFt6grmWAtCggXDM2gZxalGS8RxfX9dktj7 6QCAtAXUIMCnTpcqLtC8zX3Y2sLLaIHWXdfKNogVBl8WgtXLXiNnLdBi X-Gm-Gg: AfdE7cneuyGfKr2te4Lb3nE1E8Y2X6AYf1cM4LsAjT3jT3amu5rEhILqrI6oT9/rcTN 1nfct1zimjVmJh4RYfw4JwznHLkO8QX+QSkAd4Dc1kt1z+CE3OsxFQnm7UOiLvIweJi10OX9JVc DL3fAqUl5qn1l8TgNQjAaDPc+ovEe6BiiaraTVfylzLb7F+icfPKASRuIJ7yjO2Y9hbm40B8EDe 4I1Va+kGyHTcX9Mi8N2Oy408kmVMsMuOD9gKTm8IFD/LboXyqiUGUvCiOOD87/3jQXJfCyc0YaA xiX3t2WV5cPyKLS+KLs07HjcMr+/aZ6rU45D7+XvN9cSff7GAZjb8q9SHNtADIom7fqSVIvuee0 fUOKMjdR0EAoYEbvN0AhLx5gPr2Y/nNO5gtz+rqc5J7wZT4cdHndxmlZcVq5veb0n9MwTvHZ7ms Ez0c2RnN87LI7ZFgegiUcd8EXl52EcodF5uNuOIFWqktpHjFpBR1Uox6kBhShMvrHgKCNg2FZgL oZtf8s4+xdnng== X-Received: by 2002:ac2:59c8:0:b0:5b0:17f0:606 with SMTP id 2adb3069b0e04-5b1582a3631mr1154258e87.40.1784119843966; Wed, 15 Jul 2026 05:50:43 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:43 -0700 (PDT) From: Arsenii Pashchenko To: Greg Kroah-Hartman Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, ulijg308@gmail.com Subject: [PATCH 36/61] staging: rtl8723bs: remove rtw_wmm_event_callback and update handler Date: Wed, 15 Jul 2026 19:48:04 +0700 Message-ID: <20260715124829.90290-37-ulijg308@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260715124829.90290-1-ulijg308@gmail.com> References: <20260715124829.90290-1-ulijg308@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Completely eliminate the rtw_wmm_event_callback() wrapper function. Adapt the signature of WMMOnAssocRsp() to match the event dispatcher prototype by adding an unused buffer pointer argument. Update the other invocation site of WMMOnAssocRsp() to pass a NULL argument, and register the handler directly in the wlanevents table. This removes a useless indirection layer from the event handling path. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 4 ---- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 1 - drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 1450589aa..b57b665c2 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -1483,10 +1483,6 @@ void rtw_cpwm_event_callback(struct adapter *padapter, u8 *pbuf) cpwm_int_hdl(padapter, preportpwrstate); } -void rtw_wmm_event_callback(struct adapter *padapter, u8 *pbuf) -{ - WMMOnAssocRsp(padapter); -} /* * _rtw_join_timeout_handler - Timeout/failure handler for CMD JoinBss diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c index 25dfb20f3..62abfd896 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -4658,7 +4658,7 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res) update_capinfo(padapter, pmlmeinfo->capability); /* WMM, Update EDCA param */ - WMMOnAssocRsp(padapter); + WMMOnAssocRsp(padapter, NULL); /* HT */ HTOnAssocRsp(padapter); @@ -5614,7 +5614,7 @@ static struct fwevent wlanevents[] = { {0, NULL}, {0, &rtw_cpwm_event_callback}, {0, NULL}, - {0, &rtw_wmm_event_callback}, + {0, &WMMOnAssocRsp}, }; diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c index 1597fc33a..df5508ce5 100644 --- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c +++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c @@ -683,7 +683,7 @@ static void sort_wmm_ac_params(u32 *inx, u32 *edca) } } -void WMMOnAssocRsp(struct adapter *padapter) +void WMMOnAssocRsp(struct adapter *padapter, u8 *pbuf) { u8 ACI, ACM, AIFS, ECWMin, ECWMax, aSifsTime; u8 acm_mask; diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging/rtl8723bs/include/rtw_mlme.h index f15dfcac0..973688bef 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h @@ -264,7 +264,6 @@ extern void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf); extern void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf); extern void rtw_atimdone_event_callback(struct adapter *adapter, u8 *pbuf); extern void rtw_cpwm_event_callback(struct adapter *adapter, u8 *pbuf); -extern void rtw_wmm_event_callback(struct adapter *padapter, u8 *pbuf); extern void rtw_join_timeout_handler(struct timer_list *t); extern void _rtw_scan_timeout_handler(struct timer_list *t); diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h index b12128963..3d1126740 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -478,7 +478,7 @@ int is_IBSS_empty(struct adapter *padapter); unsigned char check_assoc_AP(u8 *pframe, uint len); int WMM_param_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE); -void WMMOnAssocRsp(struct adapter *padapter); +void WMMOnAssocRsp(struct adapter *padapter, u8 *pbuf); void HT_caps_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE); void HT_info_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE); -- 2.55.0