sync bes2600/ to v7.0-danctnix1 baseline (rebasing reference)

This commit is contained in:
2026-05-19 09:04:33 +02:00
parent fe73571183
commit e0d752aae9
15 changed files with 1410 additions and 43 deletions
+4 -3
View File
@@ -17,6 +17,7 @@
#include <linux/umh.h>
#include "epta_request.h"
#include "epta_coex.h"
#include "txrx_opt.h"
#ifdef AP_HT_CAP_UPDATE
#define HT_INFO_OFFSET 4
@@ -1154,7 +1155,7 @@ void bes2600_multicast_stop_work(struct work_struct *work)
container_of(work, struct bes2600_vif, multicast_stop_work);
if (priv->aid0_bit_set) {
del_timer_sync(&priv->mcast_timeout);
timer_delete_sync(&priv->mcast_timeout);
wsm_lock_tx(priv->hw_priv);
priv->aid0_bit_set = false;
bes2600_set_tim_impl(priv, false);
@@ -1164,7 +1165,7 @@ void bes2600_multicast_stop_work(struct work_struct *work)
void bes2600_mcast_timeout(struct timer_list *t)
{
struct bes2600_vif *priv = from_timer(priv, t, mcast_timeout);
struct bes2600_vif *priv = timer_container_of(priv, t, mcast_timeout);
wiphy_warn(priv->hw->wiphy,
"Multicast delivery timeout.\n");
@@ -1238,7 +1239,7 @@ void bes2600_suspend_resume(struct bes2600_vif *priv,
}
spin_unlock_bh(&priv->ps_state_lock);
if (cancel_tmo)
del_timer_sync(&priv->mcast_timeout);
timer_delete_sync(&priv->mcast_timeout);
} else {
spin_lock_bh(&priv->ps_state_lock);
bes2600_ps_notify(priv, arg->link_id, arg->stop);