From e77fa68f1fd76bf08229645f95fb2dcf07b6b9e2 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Sun, 8 Oct 2017 12:41:52 +0100 Subject: kernel: bump 4.4 to 4.4.91 Refresh patches. Compile-tested for: ar71xx Archer C7 v2 Run-tested on: ar71xx Archer C7 v2 Signed-off-by: Kevin Darbyshire-Bryant --- target/linux/ar71xx/patches-4.4/930-chipidea-pullup.patch | 2 +- .../680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 10 +++++----- target/linux/generic/pending-4.4/721-phy_packets.patch | 2 +- .../oxnas/patches-4.4/250-add-plxtech-vendor-prefix.patch | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'target/linux') diff --git a/target/linux/ar71xx/patches-4.4/930-chipidea-pullup.patch b/target/linux/ar71xx/patches-4.4/930-chipidea-pullup.patch index 23b8e86aac..d43e8c7dc5 100644 --- a/target/linux/ar71xx/patches-4.4/930-chipidea-pullup.patch +++ b/target/linux/ar71xx/patches-4.4/930-chipidea-pullup.patch @@ -58,7 +58,7 @@ return; + } - if (hw_read_otgsc(ci, OTGSC_BSV)) + if (hw_read_otgsc(ci, OTGSC_BSV) && !ci->vbus_active) usb_gadget_vbus_connect(&ci->gadget); --- a/include/linux/usb/chipidea.h +++ b/include/linux/usb/chipidea.h diff --git a/target/linux/generic/pending-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index 0616eaa7c0..b7ba384f4c 100644 --- a/target/linux/generic/pending-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -17,7 +17,7 @@ Signed-off-by: Felix Fietkau --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -4256,6 +4256,9 @@ static enum gro_result dev_gro_receive(s +@@ -4259,6 +4259,9 @@ static enum gro_result dev_gro_receive(s enum gro_result ret; int grow; @@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau if (!(skb->dev->features & NETIF_F_GRO)) goto normal; -@@ -5422,6 +5425,48 @@ static void __netdev_adjacent_dev_unlink +@@ -5425,6 +5428,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -76,7 +76,7 @@ Signed-off-by: Felix Fietkau static int __netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, bool master, void *private) -@@ -5493,6 +5538,7 @@ static int __netdev_upper_dev_link(struc +@@ -5496,6 +5541,7 @@ static int __netdev_upper_dev_link(struc goto rollback_lower_mesh; } @@ -84,7 +84,7 @@ Signed-off-by: Felix Fietkau call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, &changeupper_info.info); return 0; -@@ -5619,6 +5665,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -5622,6 +5668,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 call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, &changeupper_info.info); } -@@ -6159,6 +6206,7 @@ int dev_set_mac_address(struct net_devic +@@ -6162,6 +6209,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; diff --git a/target/linux/generic/pending-4.4/721-phy_packets.patch b/target/linux/generic/pending-4.4/721-phy_packets.patch index 89ffdc558d..a7a23278d0 100644 --- a/target/linux/generic/pending-4.4/721-phy_packets.patch +++ b/target/linux/generic/pending-4.4/721-phy_packets.patch @@ -86,7 +86,7 @@ help --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -2743,10 +2743,20 @@ static int xmit_one(struct sk_buff *skb, +@@ -2746,10 +2746,20 @@ static int xmit_one(struct sk_buff *skb, if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all)) dev_queue_xmit_nit(skb, dev); diff --git a/target/linux/oxnas/patches-4.4/250-add-plxtech-vendor-prefix.patch b/target/linux/oxnas/patches-4.4/250-add-plxtech-vendor-prefix.patch index d6c5c627a6..a94ac2277b 100644 --- a/target/linux/oxnas/patches-4.4/250-add-plxtech-vendor-prefix.patch +++ b/target/linux/oxnas/patches-4.4/250-add-plxtech-vendor-prefix.patch @@ -1,6 +1,6 @@ --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt -@@ -174,6 +174,7 @@ picochip Picochip Ltd +@@ -175,6 +175,7 @@ picochip Picochip Ltd plathome Plat'Home Co., Ltd. plda PLDA pixcir PIXCIR MICROELECTRONICS Co., Ltd -- cgit v1.2.3