mirror of
https://github.com/breeze303/openwrt-ipq.git
synced 2025-12-17 03:41:06 +00:00
140b5e96e1
NSS patches should always get applied last as to avoid fuzzing issues with upstream patches. Also cleanup patches that introduced spaces as indents vs. tabs Signed-off-by: Sean Khan <datapronix@protonmail.com> ath11k_nss: drop upstreamed patch A variation of this patch 'wifi: mac80211: Use flexible array in struct ieee80211_tim_ie' was upstreamed in commit 'e6e4d90b69027d74ba7e9a0a586b95a5714e10c0'. Remove it to avoid compilation issues. Signed-off-by: Sean Khan <datapronix@protonmail.com> ath11k_nss: Fix patch conflict Signed-off-by: Sean Khan <datapronix@protonmail.com>
23 lines
794 B
Diff
23 lines
794 B
Diff
--- a/net/ipv6/ip6_tunnel.c
|
|
+++ b/net/ipv6/ip6_tunnel.c
|
|
@@ -2418,7 +2418,7 @@ nla_put_failure:
|
|
*/
|
|
void ip6_update_offload_stats(struct net_device *dev, void *ptr)
|
|
{
|
|
- struct pcpu_sw_netstats *tstats = per_cpu_ptr(dev->tstats, 0);
|
|
+ struct pcpu_sw_netstats *tstats = this_cpu_ptr(dev->tstats);
|
|
const struct pcpu_sw_netstats *offload_stats =
|
|
(struct pcpu_sw_netstats *)ptr;
|
|
|
|
--- a/net/ipv6/sit.c
|
|
+++ b/net/ipv6/sit.c
|
|
@@ -1737,7 +1737,7 @@ nla_put_failure:
|
|
/* QCA NSS Clients Support - Start */
|
|
void ipip6_update_offload_stats(struct net_device *dev, void *ptr)
|
|
{
|
|
- struct pcpu_sw_netstats *tstats = per_cpu_ptr(dev->tstats, 0);
|
|
+ struct pcpu_sw_netstats *tstats = this_cpu_ptr(dev->tstats);
|
|
const struct pcpu_sw_netstats *offload_stats =
|
|
(struct pcpu_sw_netstats *)ptr;
|
|
|