diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-10-18 12:09:22 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-10-19 10:01:57 +0200 |
| commit | ca88f4153f8f3f857451a1705f08e19fffa287fd (patch) | |
| tree | ea13fedf1c9030842146342ea602ebac1029255b /target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch | |
| parent | 6d682d82b02ae0eb4eba5186cdb9af521dd30249 (diff) | |
| download | upstream-ca88f4153f8f3f857451a1705f08e19fffa287fd.tar.gz upstream-ca88f4153f8f3f857451a1705f08e19fffa287fd.tar.bz2 upstream-ca88f4153f8f3f857451a1705f08e19fffa287fd.zip | |
kernel: bump 4.14 to 4.14.77
Refreshed all patches.
Altered patches:
- 666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
New symbol for arm targets:
- HARDEN_BRANCH_PREDICTOR
Compile-tested on: ar71xx, cns3xxx, imx6
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch')
| -rw-r--r-- | target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index 36c0fb57ae..feeb7e70f8 100644 --- a/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-4.14/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 -@@ -4783,6 +4783,9 @@ static enum gro_result dev_gro_receive(s +@@ -4805,6 +4805,9 @@ static enum gro_result dev_gro_receive(s enum gro_result ret; int grow; @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (netif_elide_gro(skb->dev)) goto normal; -@@ -6253,6 +6256,48 @@ static void __netdev_adjacent_dev_unlink +@@ -6275,6 +6278,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) -@@ -6291,6 +6336,7 @@ static int __netdev_upper_dev_link(struc +@@ -6313,6 +6358,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, dev, &changeupper_info.info); ret = notifier_to_errno(ret); -@@ -6368,6 +6414,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -6390,6 +6436,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, dev, &changeupper_info.info); } -@@ -6938,6 +6985,7 @@ int dev_set_mac_address(struct net_devic +@@ -6962,6 +7009,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; |