diff options
Diffstat (limited to 'target/linux/generic/pending-4.19')
| -rw-r--r-- | target/linux/generic/pending-4.19/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch | 11 | ||||
| -rw-r--r-- | target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 10 |
2 files changed, 7 insertions, 14 deletions
diff --git a/target/linux/generic/pending-4.19/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch b/target/linux/generic/pending-4.19/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch index 9e97f8af2d..6b74c7da1d 100644 --- a/target/linux/generic/pending-4.19/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch +++ b/target/linux/generic/pending-4.19/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch @@ -66,11 +66,9 @@ Changes since v1: drivers/irqchip/irq-ath79-misc.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 6 deletions(-) -diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c -index 4a70c5d..25a5789 100644 --- a/arch/mips/ath79/setup.c +++ b/arch/mips/ath79/setup.c -@@ -210,12 +210,6 @@ const char *get_system_type(void) +@@ -211,12 +211,6 @@ const char *get_system_type(void) return ath79_sys_type; } @@ -83,8 +81,6 @@ index 4a70c5d..25a5789 100644 unsigned int get_c0_compare_int(void) { return CP0_LEGACY_COMPARE_IRQ; -diff --git a/drivers/irqchip/irq-ath79-misc.c b/drivers/irqchip/irq-ath79-misc.c -index aa72907..0390603 100644 --- a/drivers/irqchip/irq-ath79-misc.c +++ b/drivers/irqchip/irq-ath79-misc.c @@ -22,6 +22,15 @@ @@ -103,7 +99,7 @@ index aa72907..0390603 100644 static void ath79_misc_irq_handler(struct irq_desc *desc) { -@@ -113,6 +122,8 @@ static void __init ath79_misc_intc_domain_init( +@@ -113,6 +122,8 @@ static void __init ath79_misc_intc_domai { void __iomem *base = domain->host_data; @@ -112,6 +108,3 @@ index aa72907..0390603 100644 /* Disable and clear all interrupts */ __raw_writel(0, base + AR71XX_RESET_REG_MISC_INT_ENABLE); __raw_writel(0, base + AR71XX_RESET_REG_MISC_INT_STATUS); --- -1.9.1 - diff --git a/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index 828c9554d4..a0050cfb44 100644 --- a/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> __u16 tc_index; /* traffic control index */ --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -5452,6 +5452,9 @@ static enum gro_result dev_gro_receive(s +@@ -5454,6 +5454,9 @@ static enum gro_result dev_gro_receive(s int same_flow; int grow; @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (netif_elide_gro(skb->dev)) goto normal; -@@ -6946,6 +6949,48 @@ static void __netdev_adjacent_dev_unlink +@@ -6948,6 +6951,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> static int __netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, bool master, void *upper_priv, void *upper_info, -@@ -6993,6 +7038,7 @@ static int __netdev_upper_dev_link(struc +@@ -6995,6 +7040,7 @@ static int __netdev_upper_dev_link(struc if (ret) return ret; @@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); ret = notifier_to_errno(ret); -@@ -7079,6 +7125,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -7081,6 +7127,7 @@ void netdev_upper_dev_unlink(struct net_ __netdev_adjacent_dev_unlink_neighbour(dev, upper_dev); @@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); } -@@ -7702,6 +7749,7 @@ int dev_set_mac_address(struct net_devic +@@ -7704,6 +7751,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; |