aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2020-09-12 12:16:41 -0400
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-09-12 23:39:25 +0200
commit17e64b9447959858c5c85f7f6c98264775585711 (patch)
tree6e5aa8c3121347443216647e2c5b26ebde99e63f /target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
parent96586ad8cabee6b697a8269b3a9274e138334f9e (diff)
downloadupstream-17e64b9447959858c5c85f7f6c98264775585711.tar.gz
upstream-17e64b9447959858c5c85f7f6c98264775585711.tar.bz2
upstream-17e64b9447959858c5c85f7f6c98264775585711.zip
kernel: bump 5.4 to 5.4.65
All modifications made by update_kernel.sh/no manual intervention needed Build-tested: x86_64 Run-tested: ipq806x (R7800) No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us>
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.patch12
1 files changed, 6 insertions, 6 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 2544645809..dcb3d319d5 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
@@ -196,15 +196,15 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
void netif_napi_add(struct net_device *dev, struct napi_struct *napi,
int (*poll)(struct napi_struct *, int), int weight)
{
-@@ -6238,6 +6327,7 @@ void netif_napi_add(struct net_device *d
+@@ -6237,6 +6326,7 @@ void netif_napi_add(struct net_device *d
#ifdef CONFIG_NETPOLL
napi->poll_owner = -1;
#endif
+ INIT_WORK(&napi->work, napi_workfn);
set_bit(NAPI_STATE_SCHED, &napi->state);
- napi_hash_add(napi);
- }
-@@ -6276,6 +6366,7 @@ static void flush_gro_hash(struct napi_s
+ set_bit(NAPI_STATE_NPSVC, &napi->state);
+ list_add_rcu(&napi->dev_list, &dev->napi_list);
+@@ -6277,6 +6367,7 @@ static void flush_gro_hash(struct napi_s
void netif_napi_del(struct napi_struct *napi)
{
might_sleep();
@@ -212,7 +212,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (napi_hash_del(napi))
synchronize_net();
list_del_init(&napi->dev_list);
-@@ -6288,50 +6379,18 @@ EXPORT_SYMBOL(netif_napi_del);
+@@ -6289,50 +6380,18 @@ EXPORT_SYMBOL(netif_napi_del);
static int napi_poll(struct napi_struct *n, struct list_head *repoll)
{
@@ -267,7 +267,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/* Some drivers may have called napi_schedule
* prior to exhausting their budget.
-@@ -10264,6 +10323,10 @@ static int __init net_dev_init(void)
+@@ -10265,6 +10324,10 @@ static int __init net_dev_init(void)
sd->backlog.weight = weight_p;
}