Skip to content

Commit

Permalink
ath11k_nss: Refresh patches 09-29-2024
Browse files Browse the repository at this point in the history
Signed-off-by: Sean Khan <[email protected]>
  • Loading branch information
qosmio committed Sep 30, 2024
1 parent 782416b commit cbf7189
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Signed-off-by: Tamizh Chelvam Raja <[email protected]>
if (len > size)
--- a/drivers/net/wireless/ath/ath11k/dp.c
+++ b/drivers/net/wireless/ath/ath11k/dp.c
@@ -1116,8 +1116,10 @@ int ath11k_dp_alloc(struct ath11k_base *
@@ -1115,8 +1115,10 @@ int ath11k_dp_alloc(struct ath11k_base *

INIT_LIST_HEAD(&dp->reo_cmd_list);
INIT_LIST_HEAD(&dp->reo_cmd_cache_flush_list);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Signed-off-by: Tamizh Chelvam <[email protected]>
struct ath11k_band_cap {
--- a/drivers/net/wireless/ath/ath11k/dp.c
+++ b/drivers/net/wireless/ath/ath11k/dp.c
@@ -911,7 +911,7 @@ int ath11k_dp_service_srng(struct ath11k
@@ -910,7 +910,7 @@ int ath11k_dp_service_srng(struct ath11k

hal_params = ab->hw_params.hal_params;
ath11k_dp_rxbufs_replenish(ab, id, rx_ring, 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
if (!peer) {
ath11k_warn(ab, "failed to lookup peer %pM on vdev %d\n",
addr, vdev_id);
@@ -90,7 +90,7 @@ int ath11k_dp_peer_setup(struct ath11k *
@@ -89,7 +89,7 @@ int ath11k_dp_peer_setup(struct ath11k *
peer_clean:
spin_lock_bh(&ab->base_lock);

Expand Down Expand Up @@ -2362,7 +2362,7 @@
}
--- a/drivers/net/wireless/ath/ath11k/peer.h
+++ b/drivers/net/wireless/ath/ath11k/peer.h
@@ -99,34 +99,32 @@ struct ath11k_peer {
@@ -98,34 +98,32 @@ struct ath11k_peer {
bool delete_in_progress;
};

Expand Down Expand Up @@ -2409,7 +2409,7 @@
u8* addr);
struct ath11k_ast_entry *ath11k_peer_ast_find_by_pdev_idx(struct ath11k *ar,
u8* addr);
@@ -140,11 +138,11 @@ void ath11k_peer_del_ast(struct ath11k *
@@ -139,11 +137,11 @@ void ath11k_peer_del_ast(struct ath11k *
void ath11k_peer_ast_cleanup(struct ath11k *ar, struct ath11k_peer *peer,
bool is_wds, u32 free_wds_count);
void ath11k_peer_ast_wds_wmi_wk(struct work_struct *wk);
Expand All @@ -2423,7 +2423,7 @@
u8* addr)
{
return NULL;
@@ -192,7 +190,7 @@ static inline void ath11k_peer_ast_wds_w
@@ -191,7 +189,7 @@ static inline void ath11k_peer_ast_wds_w
return;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ Signed-off-by: Sriram R <[email protected]>
return -EINVAL;
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -2416,6 +2416,9 @@ sta_get_last_rx_stats(struct sta_info *s
@@ -2412,6 +2412,9 @@ sta_get_last_rx_stats(struct sta_info *s
struct ieee80211_sta_rx_stats *stats = &sta->deflink.rx_stats;
int cpu;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ Signed-off-by: Muna Sinada <[email protected]>
[NL80211_ATTR_BSS_DUMP_INCLUDE_USE_DATA] = { .type = NLA_FLAG },
[NL80211_ATTR_MLO_TTLM_DLINK] = NLA_POLICY_EXACT_LEN(sizeof(u16) * 8),
[NL80211_ATTR_MLO_TTLM_ULINK] = NLA_POLICY_EXACT_LEN(sizeof(u16) * 8),
@@ -20324,6 +20325,42 @@ void cfg80211_schedule_channels_check(st
@@ -20314,6 +20315,42 @@ void cfg80211_schedule_channels_check(st
}
EXPORT_SYMBOL(cfg80211_schedule_channels_check);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Signed-off-by: Maharaja Kennadyrajan <[email protected]>

--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -2411,7 +2411,7 @@ void ieee80211_sta_update_pending_airtim
@@ -2407,7 +2407,7 @@ void ieee80211_sta_update_pending_airtim
}

static struct ieee80211_sta_rx_stats *
Expand All @@ -25,7 +25,7 @@ Signed-off-by: Maharaja Kennadyrajan <[email protected]>
{
struct ieee80211_sta_rx_stats *stats = &sta->deflink.rx_stats;
int cpu;
@@ -2424,8 +2424,13 @@ sta_get_last_rx_stats(struct sta_info *s
@@ -2420,8 +2420,13 @@ sta_get_last_rx_stats(struct sta_info *s

for_each_possible_cpu(cpu) {
struct ieee80211_sta_rx_stats *cpustats;
Expand All @@ -39,7 +39,7 @@ Signed-off-by: Maharaja Kennadyrajan <[email protected]>

if (time_after(cpustats->last_rx, stats->last_rx))
stats = cpustats;
@@ -2502,7 +2507,7 @@ static void sta_stats_decode_rate(struct
@@ -2498,7 +2503,7 @@ static void sta_stats_decode_rate(struct

static int sta_set_rate_info_rx(struct sta_info *sta, struct rate_info *rinfo)
{
Expand All @@ -48,7 +48,7 @@ Signed-off-by: Maharaja Kennadyrajan <[email protected]>

if (rate == STA_STATS_RATE_INVALID)
return -EINVAL;
@@ -2602,7 +2607,7 @@ void sta_set_sinfo(struct sta_info *sta,
@@ -2598,7 +2603,7 @@ void sta_set_sinfo(struct sta_info *sta,
int i, ac, cpu;
struct ieee80211_sta_rx_stats *last_rxstats;

Expand All @@ -57,7 +57,7 @@ Signed-off-by: Maharaja Kennadyrajan <[email protected]>

sinfo->generation = sdata->local->sta_generation;

@@ -2886,7 +2891,7 @@ u32 sta_get_expected_throughput(struct s
@@ -2882,7 +2887,7 @@ u32 sta_get_expected_throughput(struct s

unsigned long ieee80211_sta_last_active(struct sta_info *sta)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ Signed-off-by: Yuvasree Sivasankaran <[email protected]>
int i;

sta = kzalloc(sizeof(*sta) + hw->sta_data_size, gfp);
@@ -615,18 +617,22 @@ __sta_info_alloc(struct ieee80211_sub_if
@@ -611,18 +613,22 @@ __sta_info_alloc(struct ieee80211_sub_if

sta->last_connected = ktime_get_seconds();

Expand Down Expand Up @@ -237,7 +237,7 @@ Signed-off-by: Yuvasree Sivasankaran <[email protected]>
}

if (sta_prepare_rate_control(local, sta, gfp))
@@ -700,7 +706,8 @@ __sta_info_alloc(struct ieee80211_sub_if
@@ -696,7 +702,8 @@ __sta_info_alloc(struct ieee80211_sub_if
return sta;

free_txq:
Expand All @@ -247,7 +247,7 @@ Signed-off-by: Yuvasree Sivasankaran <[email protected]>
free:
sta_info_free_link(&sta->deflink);
#ifdef CPTCFG_MAC80211_MESH
@@ -1719,11 +1726,13 @@ void ieee80211_sta_ps_deliver_wakeup(str
@@ -1715,11 +1722,13 @@ void ieee80211_sta_ps_deliver_wakeup(str
if (!ieee80211_hw_check(&local->hw, AP_LINK_PS))
drv_sta_notify(local, sdata, STA_NOTIFY_AWAKE, &sta->sta);

Expand All @@ -265,7 +265,7 @@ Signed-off-by: Yuvasree Sivasankaran <[email protected]>
}

skb_queue_head_init(&pending);
@@ -2138,6 +2147,9 @@ ieee80211_sta_ps_deliver_response(struct
@@ -2134,6 +2143,9 @@ ieee80211_sta_ps_deliver_response(struct
* TIM recalculation.
*/

Expand All @@ -275,7 +275,7 @@ Signed-off-by: Yuvasree Sivasankaran <[email protected]>
for (tid = 0; tid < ARRAY_SIZE(sta->sta.txq); tid++) {
if (!sta->sta.txq[tid] ||
!(driver_release_tids & BIT(tid)) ||
@@ -2572,7 +2584,7 @@ static void sta_set_tidstats(struct sta_
@@ -2568,7 +2580,7 @@ static void sta_set_tidstats(struct sta_
tidstats->tx_msdu_failed = sta->deflink.status_stats.msdu_failed[tid];
}

Expand All @@ -284,7 +284,7 @@ Signed-off-by: Yuvasree Sivasankaran <[email protected]>
spin_lock_bh(&local->fq.lock);
rcu_read_lock();

@@ -2901,6 +2913,9 @@ unsigned long ieee80211_sta_last_active(
@@ -2897,6 +2909,9 @@ unsigned long ieee80211_sta_last_active(

static void sta_update_codel_params(struct sta_info *sta, u32 thr)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -2412,10 +2412,7 @@ void ieee80211_sta_update_pending_airtim
@@ -2408,10 +2408,7 @@ void ieee80211_sta_update_pending_airtim
atomic_sub(tx_airtime, &local->aql_total_pending_airtime);
tx_pending = atomic_sub_return(tx_airtime,
&local->aql_ac_pending_airtime[ac]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ Signed-off-by: Ramasamy Kaliappan <[email protected]>

--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -18877,7 +18877,8 @@ void cfg80211_conn_failed(struct net_dev
@@ -18867,7 +18867,8 @@ void cfg80211_conn_failed(struct net_dev
EXPORT_SYMBOL(cfg80211_conn_failed);

static bool __nl80211_unexpected_frame(struct net_device *dev, u8 cmd,
Expand All @@ -137,7 +137,7 @@ Signed-off-by: Ramasamy Kaliappan <[email protected]>
{
struct wireless_dev *wdev = dev->ieee80211_ptr;
struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
@@ -18903,6 +18904,9 @@ static bool __nl80211_unexpected_frame(s
@@ -18893,6 +18894,9 @@ static bool __nl80211_unexpected_frame(s
nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, addr))
goto nla_put_failure;

Expand All @@ -147,7 +147,7 @@ Signed-off-by: Ramasamy Kaliappan <[email protected]>
genlmsg_end(msg, hdr);
genlmsg_unicast(wiphy_net(&rdev->wiphy), msg, nlportid);
return true;
@@ -18926,14 +18930,15 @@ bool cfg80211_rx_spurious_frame(struct n
@@ -18916,14 +18920,15 @@ bool cfg80211_rx_spurious_frame(struct n
return false;
}
ret = __nl80211_unexpected_frame(dev, NL80211_CMD_UNEXPECTED_FRAME,
Expand All @@ -165,7 +165,7 @@ Signed-off-by: Ramasamy Kaliappan <[email protected]>
{
struct wireless_dev *wdev = dev->ieee80211_ptr;
bool ret;
@@ -18948,7 +18953,7 @@ bool cfg80211_rx_unexpected_4addr_frame(
@@ -18938,7 +18943,7 @@ bool cfg80211_rx_unexpected_4addr_frame(
}
ret = __nl80211_unexpected_frame(dev,
NL80211_CMD_UNEXPECTED_4ADDR_FRAME,
Expand Down

0 comments on commit cbf7189

Please sign in to comment.