diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-11-06 19:29:39 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-11-07 01:10:53 +0100 |
commit | 0b7311300b01d9975e9996327ee469e4f66fb2ec (patch) | |
tree | 69c7696ae97c3478df893c55458759a8dc0032ba /target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch | |
parent | 2f04012b20515eec74563de74d0528e603aa6f89 (diff) | |
download | upstream-0b7311300b01d9975e9996327ee469e4f66fb2ec.tar.gz upstream-0b7311300b01d9975e9996327ee469e4f66fb2ec.tar.bz2 upstream-0b7311300b01d9975e9996327ee469e4f66fb2ec.zip |
kernel: bump 5.4 to 5.4.158
Removed upstreamed:
generic/backport-5.4/790-v5.7-net-switchdev-do-not-propagate-bridge-updates-across.patch
All others updated automatically.
Compile-tested on: lantiq/xrx200, armvirt/64
Runtime-tested on: lantiq/xrx200, armvirt/64
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch')
-rw-r--r-- | target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch b/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch index f45efdf12b..febec868f4 100644 --- a/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch +++ b/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> static int netif_rx_internal(struct sk_buff *skb); static int call_netdevice_notifiers_info(unsigned long val, -@@ -5931,6 +5932,11 @@ void __napi_schedule(struct napi_struct +@@ -5937,6 +5938,11 @@ void __napi_schedule(struct napi_struct { unsigned long flags; @@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> local_irq_save(flags); ____napi_schedule(this_cpu_ptr(&softnet_data), n); local_irq_restore(flags); -@@ -5982,6 +5988,11 @@ EXPORT_SYMBOL(napi_schedule_prep); +@@ -5988,6 +5994,11 @@ EXPORT_SYMBOL(napi_schedule_prep); */ void __napi_schedule_irqoff(struct napi_struct *n) { @@ -119,7 +119,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (!IS_ENABLED(CONFIG_PREEMPT_RT)) ____napi_schedule(this_cpu_ptr(&softnet_data), n); else -@@ -6246,9 +6257,89 @@ static void init_gro_hash(struct napi_st +@@ -6252,9 +6263,89 @@ static void init_gro_hash(struct napi_st napi->gro_bitmask = 0; } @@ -209,7 +209,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> INIT_LIST_HEAD(&napi->poll_list); hrtimer_init(&napi->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_PINNED); napi->timer.function = napi_watchdog; -@@ -6265,6 +6356,7 @@ void netif_napi_add(struct net_device *d +@@ -6271,6 +6362,7 @@ void netif_napi_add(struct net_device *d #ifdef CONFIG_NETPOLL napi->poll_owner = -1; #endif @@ -217,7 +217,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> set_bit(NAPI_STATE_SCHED, &napi->state); set_bit(NAPI_STATE_NPSVC, &napi->state); list_add_rcu(&napi->dev_list, &dev->napi_list); -@@ -6305,6 +6397,7 @@ static void flush_gro_hash(struct napi_s +@@ -6311,6 +6403,7 @@ static void flush_gro_hash(struct napi_s void netif_napi_del(struct napi_struct *napi) { might_sleep(); @@ -225,7 +225,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (napi_hash_del(napi)) synchronize_net(); list_del_init(&napi->dev_list); -@@ -6317,50 +6410,18 @@ EXPORT_SYMBOL(netif_napi_del); +@@ -6323,50 +6416,18 @@ EXPORT_SYMBOL(netif_napi_del); static int napi_poll(struct napi_struct *n, struct list_head *repoll) { @@ -280,7 +280,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> /* Some drivers may have called napi_schedule * prior to exhausting their budget. -@@ -10340,6 +10401,10 @@ static int __init net_dev_init(void) +@@ -10346,6 +10407,10 @@ static int __init net_dev_init(void) sd->backlog.weight = weight_p; } |