From fa8e99c51d168bc1ff6e0e06b28589c20a11e27f Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Mon, 12 Mar 2018 11:51:36 +0100 Subject: kernel: bump 4.9 to 4.9.87 - Refreshed all patches Compile tested on: ar71xx Runtime tested on: ar71xx Signed-off-by: Koen Vandeputte --- .../680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch') diff --git a/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index 5d432b1f3e..86a64d8424 100644 --- a/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -34,7 +34,7 @@ Signed-off-by: Felix Fietkau __u16 tc_index; /* traffic control index */ --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -4535,6 +4535,9 @@ static enum gro_result dev_gro_receive(s +@@ -4542,6 +4542,9 @@ static enum gro_result dev_gro_receive(s enum gro_result ret; int grow; @@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau if (!(skb->dev->features & NETIF_F_GRO)) goto normal; -@@ -5823,6 +5826,48 @@ static void __netdev_adjacent_dev_unlink +@@ -5830,6 +5833,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -93,7 +93,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) -@@ -5895,6 +5940,7 @@ static int __netdev_upper_dev_link(struc +@@ -5902,6 +5947,7 @@ static int __netdev_upper_dev_link(struc goto rollback_lower_mesh; } @@ -101,7 +101,7 @@ Signed-off-by: Felix Fietkau ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, &changeupper_info.info); ret = notifier_to_errno(ret); -@@ -6021,6 +6067,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -6028,6 +6074,7 @@ void netdev_upper_dev_unlink(struct net_ list_for_each_entry(i, &upper_dev->all_adj_list.upper, list) __netdev_adjacent_dev_unlink(dev, i->dev, i->ref_nr); @@ -109,7 +109,7 @@ Signed-off-by: Felix Fietkau call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, &changeupper_info.info); } -@@ -6621,6 +6668,7 @@ int dev_set_mac_address(struct net_devic +@@ -6628,6 +6675,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; -- cgit v1.2.3