diff --git a/target/linux/ipq40xx/patches-4.14/998-ignore-peer-stats-debug-info.patch b/package/kernel/mac80211/patches/ath/998-ignore-peer-stats-debug-info.patch similarity index 85% rename from target/linux/ipq40xx/patches-4.14/998-ignore-peer-stats-debug-info.patch rename to package/kernel/mac80211/patches/ath/998-ignore-peer-stats-debug-info.patch index 781701f70d..6c315bd990 100644 --- a/target/linux/ipq40xx/patches-4.14/998-ignore-peer-stats-debug-info.patch +++ b/package/kernel/mac80211/patches/ath/998-ignore-peer-stats-debug-info.patch @@ -2,47 +2,48 @@ diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath index 7d295ee71534..50670d651cff 100644 --- a/drivers/net/wireless/ath/ath10k/htt_rx.c +++ b/drivers/net/wireless/ath/ath10k/htt_rx.c -@@ -2329,7 +2329,7 @@ +@@ -2520,7 +2520,7 @@ sgi = ATH10K_HW_GI(peer_stats->flags); if (txrate.flags == WMI_RATE_PREAMBLE_VHT && txrate.mcs > 9) { - ath10k_warn(ar, "Invalid VHT mcs %hhd peer stats", txrate.mcs); -+ ++ return; } - -@@ -2387,7 +2387,7 @@ static void ath10k_htt_fetch_peer_stats( + +@@ -2578,7 +2578,7 @@ ppdu_len = resp->peer_tx_stats.ppdu_len * sizeof(__le32); if (skb->len < sizeof(struct htt_resp_hdr) + num_ppdu * ppdu_len) { - ath10k_warn(ar, "Invalid peer stats buf length %d\n", skb->len); -+ ++ return; } -@@ -2399,8 +2399,8 @@ static void ath10k_htt_fetch_peer_stats( +@@ -2590,8 +2590,8 @@ spin_lock_bh(&ar->data_lock); peer = ath10k_peer_find_by_id(ar, peer_id); - if (!peer) { + if (!peer || !peer->sta) { - ath10k_warn(ar, "Invalid peer id %d peer stats buffer\n", - peer_id); -+ -+ ++ ++ goto out; } + diff --git a/drivers/net/wireless/ath/ath10k/txrx.c b/drivers/net/wireless/ath/ath10k/txrx.c --- a/drivers/net/wireless/ath/ath10k/txrx.c +++ b/drivers/net/wireless/ath/ath10k/txrx.c - -@@ -239,8 +239,8 @@ +@@ -261,8 +261,8 @@ spin_lock_bh(&ar->data_lock); peer = ath10k_peer_find_by_id(ar, ev->peer_id); if (!peer) { - ath10k_warn(ar, "peer-unmap-event: unknown peer id %d\n", - ev->peer_id); -+ -+ ++ ++ goto exit; } + diff --git a/target/linux/ipq40xx/patches-4.14/998-ignore-stats-debug-info.patch b/target/linux/ipq40xx/patches-4.14/998-ignore-stats-debug-info.patch new file mode 100644 index 0000000000..6d967d8d33 --- /dev/null +++ b/target/linux/ipq40xx/patches-4.14/998-ignore-stats-debug-info.patch @@ -0,0 +1,19 @@ +diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c +index 10a4467..eb8fb94 100644 +--- a/drivers/base/firmware_class.c ++++ b/drivers/base/firmware_class.c +@@ -1218,10 +1218,10 @@ + if (ret) { + if (!(opt_flags & FW_OPT_NO_WARN)) + dev_warn(device, +- "Direct firmware load for %s failed with error %d\n", +- name, ret); ++ "Direct firmware load for %s \n", ++ name); + if (opt_flags & FW_OPT_USERHELPER) { +- dev_warn(device, "Falling back to user helper\n"); ++ dev_warn(device, "Load Wireless ART files\n"); + ret = fw_load_from_user_helper(fw, name, device, + opt_flags); + } +