diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-10-18 12:01:18 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-10-19 10:00:48 +0200 |
| commit | dbd067013d05d240b44f1c75fffde6573f8c86bd (patch) | |
| tree | 082d63e7c6cd02af58a4e3188ddbf36a2f77ae31 /target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch | |
| parent | 486dc7583d8d6cc9f57d4bf9781ff5680181feee (diff) | |
| download | openwrt-dbd067013d05d240b44f1c75fffde6573f8c86bd.tar.gz openwrt-dbd067013d05d240b44f1c75fffde6573f8c86bd.tar.bz2 openwrt-dbd067013d05d240b44f1c75fffde6573f8c86bd.zip | |
kernel: bump 4.9 to 4.9.134
Refreshed all patches.
Compile-tested on: ar71xx
Runtime-tested on: ar71xx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch')
| -rw-r--r-- | target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 12 |
1 files changed, 6 insertions, 6 deletions
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 4d1f6c4c2b..58518f9cfd 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 @@ -22,7 +22,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #endif --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -742,7 +742,8 @@ struct sk_buff { +@@ -747,7 +747,8 @@ struct sk_buff { #ifdef CONFIG_NET_SWITCHDEV __u8 offload_fwd_mark:1; #endif @@ -34,7 +34,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 -@@ -4550,6 +4550,9 @@ static enum gro_result dev_gro_receive(s +@@ -4572,6 +4572,9 @@ static enum gro_result dev_gro_receive(s enum gro_result ret; int grow; @@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (!(skb->dev->features & NETIF_F_GRO)) goto normal; -@@ -5838,6 +5841,48 @@ static void __netdev_adjacent_dev_unlink +@@ -5860,6 +5863,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -93,7 +93,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) -@@ -5910,6 +5955,7 @@ static int __netdev_upper_dev_link(struc +@@ -5932,6 +5977,7 @@ static int __netdev_upper_dev_link(struc goto rollback_lower_mesh; } @@ -101,7 +101,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, &changeupper_info.info); ret = notifier_to_errno(ret); -@@ -6036,6 +6082,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -6058,6 +6104,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 <nbd@nbd.name> call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, &changeupper_info.info); } -@@ -6636,6 +6683,7 @@ int dev_set_mac_address(struct net_devic +@@ -6660,6 +6707,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; |