From 5d3a6fd970619dfc55f8259035c3027d7613a2a6 Mon Sep 17 00:00:00 2001 From: John Audia Date: Wed, 17 Feb 2021 05:58:14 -0500 Subject: kernel: bump 5.4 to 5.4.99 Ran update_kernel.sh in a fresh clone without any existing toolchains. No manual changes needed. Build system: x86_64 Build-tested: bcm27xx/bcm2711 Signed-off-by: John Audia --- .../690-net-add-support-for-threaded-NAPI-polling.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch') 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 d80b1ecd0f..6d24007b6a 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 @@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau static int netif_rx_internal(struct sk_buff *skb); static int call_netdevice_notifiers_info(unsigned long val, -@@ -5910,6 +5911,11 @@ void __napi_schedule(struct napi_struct +@@ -5911,6 +5912,11 @@ void __napi_schedule(struct napi_struct { unsigned long flags; @@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau local_irq_save(flags); ____napi_schedule(this_cpu_ptr(&softnet_data), n); local_irq_restore(flags); -@@ -5957,6 +5963,11 @@ EXPORT_SYMBOL(napi_schedule_prep); +@@ -5958,6 +5964,11 @@ EXPORT_SYMBOL(napi_schedule_prep); */ void __napi_schedule_irqoff(struct napi_struct *n) { @@ -111,7 +111,7 @@ Signed-off-by: Felix Fietkau ____napi_schedule(this_cpu_ptr(&softnet_data), n); } EXPORT_SYMBOL(__napi_schedule_irqoff); -@@ -6218,6 +6229,84 @@ static void init_gro_hash(struct napi_st +@@ -6219,6 +6230,84 @@ static void init_gro_hash(struct napi_st napi->gro_bitmask = 0; } @@ -196,7 +196,7 @@ Signed-off-by: Felix Fietkau void netif_napi_add(struct net_device *dev, struct napi_struct *napi, int (*poll)(struct napi_struct *, int), int weight) { -@@ -6237,6 +6326,7 @@ void netif_napi_add(struct net_device *d +@@ -6238,6 +6327,7 @@ void netif_napi_add(struct net_device *d #ifdef CONFIG_NETPOLL napi->poll_owner = -1; #endif @@ -204,7 +204,7 @@ Signed-off-by: Felix Fietkau set_bit(NAPI_STATE_SCHED, &napi->state); 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 +@@ -6278,6 +6368,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 if (napi_hash_del(napi)) synchronize_net(); list_del_init(&napi->dev_list); -@@ -6289,50 +6380,18 @@ EXPORT_SYMBOL(netif_napi_del); +@@ -6290,50 +6381,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 /* Some drivers may have called napi_schedule * prior to exhausting their budget. -@@ -10270,6 +10329,10 @@ static int __init net_dev_init(void) +@@ -10271,6 +10330,10 @@ static int __init net_dev_init(void) sd->backlog.weight = weight_p; } -- cgit v1.2.3