diff options
| author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2018-04-24 12:19:43 +0000 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2018-04-26 08:53:54 +0200 |
| commit | 9aa196e0f260986991dc8ea65a219f81aed0197e (patch) | |
| tree | 99abd0b8596eb91fb0837c0e49772fc202429cad /target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch | |
| parent | bdb0de1bbce235244bcd0503c71886409379f4fc (diff) | |
| download | upstream-9aa196e0f260986991dc8ea65a219f81aed0197e.tar.gz upstream-9aa196e0f260986991dc8ea65a219f81aed0197e.tar.bz2 upstream-9aa196e0f260986991dc8ea65a219f81aed0197e.zip | |
kernel: bump 4.9 to 4.9.96
Refresh patches, following required reworking:
ar71xx/patches-4.9/930-chipidea-pullup.patch
layerscape/patches-4.9/302-dts-support-layercape.patch
sunxi/patches-4.9/0052-stmmac-form-4-12.patch
Fixes for CVEs:
CVE-2018-1108
CVE-2018-1092
Tested on: ar71xx Archer C7 v2
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Tested-by: Arjen de Korte <build+openwrt@de-korte.org>
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 | 10 |
1 files changed, 5 insertions, 5 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 86a64d8424..4d1f6c4c2b 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 <nbd@nbd.name> __u16 tc_index; /* traffic control index */ --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -4542,6 +4542,9 @@ static enum gro_result dev_gro_receive(s +@@ -4550,6 +4550,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; -@@ -5830,6 +5833,48 @@ static void __netdev_adjacent_dev_unlink +@@ -5838,6 +5841,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) -@@ -5902,6 +5947,7 @@ static int __netdev_upper_dev_link(struc +@@ -5910,6 +5955,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); -@@ -6028,6 +6074,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -6036,6 +6082,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); } -@@ -6628,6 +6675,7 @@ int dev_set_mac_address(struct net_devic +@@ -6636,6 +6683,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; |