diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-11-28 11:01:46 +0100 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-12-10 11:48:44 +0100 |
commit | 4e38fc824c8ed69fd0adbcc5a98b9a6476dde657 (patch) | |
tree | ca85b05ed24b2fc53e709b2f3c0a3c4b5c5e9293 /target/linux/generic/pending-3.18/680-NET-skip-GRO-for-foreign-MAC-addresses.patch | |
parent | 8c0f6a010a5b7011acbbf2ac5b345d9cf1c14b1f (diff) | |
download | upstream-4e38fc824c8ed69fd0adbcc5a98b9a6476dde657.tar.gz upstream-4e38fc824c8ed69fd0adbcc5a98b9a6476dde657.tar.bz2 upstream-4e38fc824c8ed69fd0adbcc5a98b9a6476dde657.zip |
kernel: bump 3.18 to 3.18.128
Refreshed all patches.
Altered patches:
- 002-phy_drivers_backport.patch
Compile-tested on: adm5120
Runtime-tested on: none
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-3.18/680-NET-skip-GRO-for-foreign-MAC-addresses.patch')
-rw-r--r-- | target/linux/generic/pending-3.18/680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/pending-3.18/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-3.18/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index 1f2f89daa9..038c75b680 100644 --- a/target/linux/generic/pending-3.18/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-3.18/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (!(skb->dev->features & NETIF_F_GRO)) goto normal; -@@ -5099,6 +5102,48 @@ static void __netdev_adjacent_dev_unlink +@@ -5103,6 +5106,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -76,7 +76,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 *private) -@@ -5159,6 +5204,7 @@ static int __netdev_upper_dev_link(struc +@@ -5163,6 +5208,7 @@ static int __netdev_upper_dev_link(struc goto rollback_lower_mesh; } @@ -84,7 +84,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> call_netdevice_notifiers(NETDEV_CHANGEUPPER, dev); return 0; -@@ -5276,6 +5322,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -5280,6 +5326,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); @@ -92,7 +92,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> call_netdevice_notifiers(NETDEV_CHANGEUPPER, dev); } EXPORT_SYMBOL(netdev_upper_dev_unlink); -@@ -5795,6 +5842,7 @@ int dev_set_mac_address(struct net_devic +@@ -5799,6 +5846,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; |