From dc8cc446128776ee69571ff03925e6bd3256c2e0 Mon Sep 17 00:00:00 2001 From: Kabuli Chana Date: Tue, 23 Feb 2021 10:29:49 -0700 Subject: kernel: bump version 5.10 to 5.10.18 update kernel version, refresh current patchset Signed-off-by: Kabuli Chana [rebase/refresh] Signed-off-by: Adrian Schmutzler --- .../generic/pending-5.10/203-kallsyms_uncompressed.patch | 8 ++++---- .../680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 10 +++++----- .../690-net-add-support-for-threaded-NAPI-polling.patch | 14 +++++++------- .../840-hwrng-bcm2835-set-quality-to-1000.patch | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) (limited to 'target/linux/generic') diff --git a/target/linux/generic/pending-5.10/203-kallsyms_uncompressed.patch b/target/linux/generic/pending-5.10/203-kallsyms_uncompressed.patch index 35d0333ad5..348a5afa3d 100644 --- a/target/linux/generic/pending-5.10/203-kallsyms_uncompressed.patch +++ b/target/linux/generic/pending-5.10/203-kallsyms_uncompressed.patch @@ -65,7 +65,7 @@ Signed-off-by: Felix Fietkau static int absolute_percpu; static int base_relative; -@@ -480,6 +481,9 @@ static void write_src(void) +@@ -486,6 +487,9 @@ static void write_src(void) free(markers); @@ -75,7 +75,7 @@ Signed-off-by: Felix Fietkau output_label("kallsyms_token_table"); off = 0; for (i = 0; i < 256; i++) { -@@ -531,6 +535,9 @@ static unsigned char *find_token(unsigne +@@ -537,6 +541,9 @@ static unsigned char *find_token(unsigne { int i; @@ -85,7 +85,7 @@ Signed-off-by: Felix Fietkau for (i = 0; i < len - 1; i++) { if (str[i] == token[0] && str[i+1] == token[1]) return &str[i]; -@@ -603,6 +610,9 @@ static void optimize_result(void) +@@ -609,6 +616,9 @@ static void optimize_result(void) { int i, best; @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau /* using the '\0' symbol last allows compress_symbols to use standard * fast string functions */ for (i = 255; i >= 0; i--) { -@@ -767,6 +777,8 @@ int main(int argc, char **argv) +@@ -773,6 +783,8 @@ int main(int argc, char **argv) absolute_percpu = 1; else if (strcmp(argv[i], "--base-relative") == 0) base_relative = 1; diff --git a/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index cd1b30b4af..6d0c84c494 100644 --- a/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau __u16 tc_index; /* traffic control index */ --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -5962,6 +5962,9 @@ static enum gro_result dev_gro_receive(s +@@ -5965,6 +5965,9 @@ static enum gro_result dev_gro_receive(s int same_flow; int grow; @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau if (netif_elide_gro(skb->dev)) goto normal; -@@ -7790,6 +7793,48 @@ static void __netdev_adjacent_dev_unlink +@@ -7793,6 +7796,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau static int __netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, bool master, void *upper_priv, void *upper_info, -@@ -7841,6 +7886,7 @@ static int __netdev_upper_dev_link(struc +@@ -7844,6 +7889,7 @@ static int __netdev_upper_dev_link(struc if (ret) return ret; @@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); ret = notifier_to_errno(ret); -@@ -7937,6 +7983,7 @@ static void __netdev_upper_dev_unlink(st +@@ -7940,6 +7986,7 @@ static void __netdev_upper_dev_unlink(st __netdev_adjacent_dev_unlink_neighbour(dev, upper_dev); @@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); -@@ -8723,6 +8770,7 @@ int dev_set_mac_address(struct net_devic +@@ -8726,6 +8773,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; diff --git a/target/linux/generic/pending-5.10/690-net-add-support-for-threaded-NAPI-polling.patch b/target/linux/generic/pending-5.10/690-net-add-support-for-threaded-NAPI-polling.patch index 2979934926..b2c2d00ec0 100644 --- a/target/linux/generic/pending-5.10/690-net-add-support-for-threaded-NAPI-polling.patch +++ b/target/linux/generic/pending-5.10/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, -@@ -6404,6 +6405,11 @@ void __napi_schedule(struct napi_struct +@@ -6407,6 +6408,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); -@@ -6451,6 +6457,11 @@ EXPORT_SYMBOL(napi_schedule_prep); +@@ -6454,6 +6460,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); -@@ -6712,6 +6723,86 @@ static void init_gro_hash(struct napi_st +@@ -6715,6 +6726,86 @@ static void init_gro_hash(struct napi_st napi->gro_bitmask = 0; } @@ -198,7 +198,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) { -@@ -6735,6 +6826,7 @@ void netif_napi_add(struct net_device *d +@@ -6738,6 +6829,7 @@ void netif_napi_add(struct net_device *d #ifdef CONFIG_NETPOLL napi->poll_owner = -1; #endif @@ -206,7 +206,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); -@@ -6777,6 +6869,7 @@ void __netif_napi_del(struct napi_struct +@@ -6780,6 +6872,7 @@ void __netif_napi_del(struct napi_struct if (!test_and_clear_bit(NAPI_STATE_LISTED, &napi->state)) return; @@ -214,7 +214,7 @@ Signed-off-by: Felix Fietkau napi_hash_del(napi); list_del_rcu(&napi->dev_list); napi_free_frags(napi); -@@ -6788,53 +6881,19 @@ EXPORT_SYMBOL(__netif_napi_del); +@@ -6791,53 +6884,19 @@ EXPORT_SYMBOL(__netif_napi_del); static int napi_poll(struct napi_struct *n, struct list_head *repoll) { @@ -272,7 +272,7 @@ Signed-off-by: Felix Fietkau /* Some drivers may have called napi_schedule * prior to exhausting their budget. */ -@@ -11288,6 +11347,10 @@ static int __init net_dev_init(void) +@@ -11291,6 +11350,10 @@ static int __init net_dev_init(void) sd->backlog.weight = weight_p; } diff --git a/target/linux/generic/pending-5.10/840-hwrng-bcm2835-set-quality-to-1000.patch b/target/linux/generic/pending-5.10/840-hwrng-bcm2835-set-quality-to-1000.patch index 247c6d8364..580f0b1bfa 100644 --- a/target/linux/generic/pending-5.10/840-hwrng-bcm2835-set-quality-to-1000.patch +++ b/target/linux/generic/pending-5.10/840-hwrng-bcm2835-set-quality-to-1000.patch @@ -16,11 +16,11 @@ Signed-off-by: Álvaro Fernández Rojas --- a/drivers/char/hw_random/bcm2835-rng.c +++ b/drivers/char/hw_random/bcm2835-rng.c -@@ -167,6 +167,7 @@ static int bcm2835_rng_probe(struct plat +@@ -163,6 +163,7 @@ static int bcm2835_rng_probe(struct plat priv->rng.init = bcm2835_rng_init; priv->rng.read = bcm2835_rng_read; priv->rng.cleanup = bcm2835_rng_cleanup; + priv->rng.quality = 1000; if (dev_of_node(dev)) { - rng_id = of_match_node(bcm2835_rng_of_match, np); + rng_id = of_match_node(bcm2835_rng_of_match, dev->of_node); -- cgit v1.2.3