From 0dcc4d239da78bc20b091d50c097c386e0e61902 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 2 Apr 2017 11:53:42 +0200 Subject: kernel: update kernel 4.4 to 4.4.59 Signed-off-by: Hauke Mehrtens --- .../generic/patches-4.4/020-bcma-from-4.5.patch | 4 ++-- .../generic/patches-4.4/025-bcma-from-4.11.patch | 20 -------------------- ...-02-MIPS-Stack-unwinding-while-on-IRQ-stack.patch | 2 +- ...20-bridge_allow_receiption_on_disabled_port.patch | 4 ++-- .../generic/patches-4.4/630-packet_socket_type.patch | 6 +++--- .../patches-4.4/640-bridge_no_eap_forward.patch | 2 +- .../patches-4.4/641-bridge_always_accept_eap.patch | 2 +- .../patches-4.4/642-bridge_port_isolate.patch | 2 +- .../patches-4.4/653-disable_netlink_trim.patch | 5 +---- .../680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 10 +++++----- .../linux/generic/patches-4.4/721-phy_packets.patch | 2 +- .../811-pci_disable_usb_common_quirks.patch | 2 +- .../generic/patches-4.4/901-debloat_sock_diag.patch | 4 ++-- .../linux/generic/patches-4.4/902-debloat_proc.patch | 2 +- 14 files changed, 22 insertions(+), 45 deletions(-) (limited to 'target/linux/generic') diff --git a/target/linux/generic/patches-4.4/020-bcma-from-4.5.patch b/target/linux/generic/patches-4.4/020-bcma-from-4.5.patch index 21ebff5..c5d7bc7 100644 --- a/target/linux/generic/patches-4.4/020-bcma-from-4.5.patch +++ b/target/linux/generic/patches-4.4/020-bcma-from-4.5.patch @@ -1,6 +1,6 @@ --- a/drivers/bcma/main.c +++ b/drivers/bcma/main.c -@@ -668,11 +668,36 @@ static int bcma_device_uevent(struct dev +@@ -672,11 +672,36 @@ static int bcma_device_uevent(struct dev core->id.rev, core->id.class); } @@ -38,7 +38,7 @@ if (err) return err; -@@ -691,7 +716,7 @@ static int __init bcma_modinit(void) +@@ -695,7 +720,7 @@ static int __init bcma_modinit(void) return err; } diff --git a/target/linux/generic/patches-4.4/025-bcma-from-4.11.patch b/target/linux/generic/patches-4.4/025-bcma-from-4.11.patch index d5bdd2d..a3b0321 100644 --- a/target/linux/generic/patches-4.4/025-bcma-from-4.11.patch +++ b/target/linux/generic/patches-4.4/025-bcma-from-4.11.patch @@ -83,23 +83,3 @@ } else { core->dev.dma_mask = &core->dev.coherent_dma_mask; core->dma_dev = &core->dev; -@@ -633,8 +634,11 @@ static int bcma_device_probe(struct devi - drv); - int err = 0; - -+ get_device(dev); - if (adrv->probe) - err = adrv->probe(core); -+ if (err) -+ put_device(dev); - - return err; - } -@@ -647,6 +651,7 @@ static int bcma_device_remove(struct dev - - if (adrv->remove) - adrv->remove(core); -+ put_device(dev); - - return 0; - } diff --git a/target/linux/generic/patches-4.4/062-02-MIPS-Stack-unwinding-while-on-IRQ-stack.patch b/target/linux/generic/patches-4.4/062-02-MIPS-Stack-unwinding-while-on-IRQ-stack.patch index 513e904..fc559ee 100644 --- a/target/linux/generic/patches-4.4/062-02-MIPS-Stack-unwinding-while-on-IRQ-stack.patch +++ b/target/linux/generic/patches-4.4/062-02-MIPS-Stack-unwinding-while-on-IRQ-stack.patch @@ -19,7 +19,7 @@ Signed-off-by: Matt Redfearn #include #include #include -@@ -507,7 +508,19 @@ EXPORT_SYMBOL(unwind_stack_by_address); +@@ -552,7 +553,19 @@ EXPORT_SYMBOL(unwind_stack_by_address); unsigned long unwind_stack(struct task_struct *task, unsigned long *sp, unsigned long pc, unsigned long *ra) { diff --git a/target/linux/generic/patches-4.4/120-bridge_allow_receiption_on_disabled_port.patch b/target/linux/generic/patches-4.4/120-bridge_allow_receiption_on_disabled_port.patch index 727ab75..bba6074 100644 --- a/target/linux/generic/patches-4.4/120-bridge_allow_receiption_on_disabled_port.patch +++ b/target/linux/generic/patches-4.4/120-bridge_allow_receiption_on_disabled_port.patch @@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c -@@ -217,11 +217,13 @@ EXPORT_SYMBOL_GPL(br_handle_frame_finish +@@ -218,11 +218,13 @@ EXPORT_SYMBOL_GPL(br_handle_frame_finish static int br_handle_local_finish(struct net *net, struct sock *sk, struct sk_buff *skb) { struct net_bridge_port *p = br_port_get_rcu(skb->dev); @@ -33,7 +33,7 @@ Signed-off-by: Felix Fietkau return 0; /* process further */ } -@@ -296,6 +298,18 @@ rx_handler_result_t br_handle_frame(stru +@@ -297,6 +299,18 @@ rx_handler_result_t br_handle_frame(stru forward: switch (p->state) { diff --git a/target/linux/generic/patches-4.4/630-packet_socket_type.patch b/target/linux/generic/patches-4.4/630-packet_socket_type.patch index 0c24863..c334418 100644 --- a/target/linux/generic/patches-4.4/630-packet_socket_type.patch +++ b/target/linux/generic/patches-4.4/630-packet_socket_type.patch @@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -3111,6 +3113,7 @@ static int packet_create(struct net *net +@@ -3115,6 +3117,7 @@ static int packet_create(struct net *net mutex_init(&po->pg_vec_lock); po->rollover = NULL; po->prot_hook.func = packet_rcv; @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3733,6 +3736,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3737,6 +3740,16 @@ packet_setsockopt(struct socket *sock, i po->xmit = val ? packet_direct_xmit : dev_queue_xmit; return 0; } @@ -108,7 +108,7 @@ Signed-off-by: Felix Fietkau default: return -ENOPROTOOPT; } -@@ -3785,6 +3798,13 @@ static int packet_getsockopt(struct sock +@@ -3789,6 +3802,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; diff --git a/target/linux/generic/patches-4.4/640-bridge_no_eap_forward.patch b/target/linux/generic/patches-4.4/640-bridge_no_eap_forward.patch index 24cc2b2..a6dfb4e 100644 --- a/target/linux/generic/patches-4.4/640-bridge_no_eap_forward.patch +++ b/target/linux/generic/patches-4.4/640-bridge_no_eap_forward.patch @@ -8,7 +8,7 @@ each other via bridges. --- --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c -@@ -168,7 +168,11 @@ int br_handle_frame_finish(struct net *n +@@ -169,7 +169,11 @@ int br_handle_frame_finish(struct net *n if (IS_ENABLED(CONFIG_INET) && skb->protocol == htons(ETH_P_ARP)) br_do_proxy_arp(skb, br, vid, p); diff --git a/target/linux/generic/patches-4.4/641-bridge_always_accept_eap.patch b/target/linux/generic/patches-4.4/641-bridge_always_accept_eap.patch index 5da6ab6..a4e2c03 100644 --- a/target/linux/generic/patches-4.4/641-bridge_always_accept_eap.patch +++ b/target/linux/generic/patches-4.4/641-bridge_always_accept_eap.patch @@ -6,7 +6,7 @@ issues with WDS. --- --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c -@@ -152,7 +152,7 @@ int br_handle_frame_finish(struct net *n +@@ -153,7 +153,7 @@ int br_handle_frame_finish(struct net *n br_multicast_rcv(br, p, skb, vid)) goto drop; diff --git a/target/linux/generic/patches-4.4/642-bridge_port_isolate.patch b/target/linux/generic/patches-4.4/642-bridge_port_isolate.patch index 3ece047..02dfea4 100644 --- a/target/linux/generic/patches-4.4/642-bridge_port_isolate.patch +++ b/target/linux/generic/patches-4.4/642-bridge_port_isolate.patch @@ -48,7 +48,7 @@ Isolating individual bridge ports --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c -@@ -191,8 +191,8 @@ int br_handle_frame_finish(struct net *n +@@ -192,8 +192,8 @@ int br_handle_frame_finish(struct net *n unicast = false; br->dev->stats.multicast++; diff --git a/target/linux/generic/patches-4.4/653-disable_netlink_trim.patch b/target/linux/generic/patches-4.4/653-disable_netlink_trim.patch index 073550c..cc19b8e 100644 --- a/target/linux/generic/patches-4.4/653-disable_netlink_trim.patch +++ b/target/linux/generic/patches-4.4/653-disable_netlink_trim.patch @@ -1,15 +1,12 @@ --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c -@@ -1812,27 +1812,7 @@ void netlink_detachskb(struct sock *sk, +@@ -1187,24 +1187,7 @@ void netlink_detachskb(struct sock *sk, static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation) { - int delta; - WARN_ON(skb->sk != NULL); -- if (netlink_skb_is_mmaped(skb)) -- return skb; -- - delta = skb->end - skb->tail; - if (is_vmalloc_addr(skb->head) || delta * 2 < skb->truesize) - return skb; diff --git a/target/linux/generic/patches-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/patches-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index 0794d89..c1a076a 100644 --- a/target/linux/generic/patches-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/patches-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 -@@ -4219,6 +4219,9 @@ static enum gro_result dev_gro_receive(s +@@ -4246,6 +4246,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; -@@ -5378,6 +5381,48 @@ static void __netdev_adjacent_dev_unlink +@@ -5405,6 +5408,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) -@@ -5449,6 +5494,7 @@ static int __netdev_upper_dev_link(struc +@@ -5476,6 +5521,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; -@@ -5575,6 +5621,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -5602,6 +5648,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); } -@@ -6115,6 +6162,7 @@ int dev_set_mac_address(struct net_devic +@@ -6142,6 +6189,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/patches-4.4/721-phy_packets.patch b/target/linux/generic/patches-4.4/721-phy_packets.patch index 8333dcc..d824642 100644 --- a/target/linux/generic/patches-4.4/721-phy_packets.patch +++ b/target/linux/generic/patches-4.4/721-phy_packets.patch @@ -86,7 +86,7 @@ help --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -2708,10 +2708,20 @@ static int xmit_one(struct sk_buff *skb, +@@ -2735,10 +2735,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/generic/patches-4.4/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-4.4/811-pci_disable_usb_common_quirks.patch index a4b93df..f22bf80 100644 --- a/target/linux/generic/patches-4.4/811-pci_disable_usb_common_quirks.patch +++ b/target/linux/generic/patches-4.4/811-pci_disable_usb_common_quirks.patch @@ -84,7 +84,7 @@ #endif /* __LINUX_USB_PCI_QUIRKS_H */ --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h -@@ -459,7 +459,14 @@ extern int usb_hcd_pci_probe(struct pci_ +@@ -460,7 +460,14 @@ extern int usb_hcd_pci_probe(struct pci_ extern void usb_hcd_pci_remove(struct pci_dev *dev); extern void usb_hcd_pci_shutdown(struct pci_dev *dev); diff --git a/target/linux/generic/patches-4.4/901-debloat_sock_diag.patch b/target/linux/generic/patches-4.4/901-debloat_sock_diag.patch index b70f44e..fa9f37b 100644 --- a/target/linux/generic/patches-4.4/901-debloat_sock_diag.patch +++ b/target/linux/generic/patches-4.4/901-debloat_sock_diag.patch @@ -25,7 +25,7 @@ obj-$(CONFIG_PROC_FS) += net-procfs.o --- a/net/core/sock.c +++ b/net/core/sock.c -@@ -1469,9 +1469,11 @@ void sk_destruct(struct sock *sk) +@@ -1474,9 +1474,11 @@ void sk_destruct(struct sock *sk) static void __sk_free(struct sock *sk) { @@ -59,7 +59,7 @@ Support for UNIX socket monitoring interface used by the ss tool. --- a/net/netlink/Kconfig +++ b/net/netlink/Kconfig -@@ -13,6 +13,7 @@ config NETLINK_MMAP +@@ -4,6 +4,7 @@ config NETLINK_DIAG tristate "NETLINK: socket monitoring interface" diff --git a/target/linux/generic/patches-4.4/902-debloat_proc.patch b/target/linux/generic/patches-4.4/902-debloat_proc.patch index 3123a4b..2f54db5 100644 --- a/target/linux/generic/patches-4.4/902-debloat_proc.patch +++ b/target/linux/generic/patches-4.4/902-debloat_proc.patch @@ -173,7 +173,7 @@ goto err; --- a/net/core/sock.c +++ b/net/core/sock.c -@@ -3036,6 +3036,8 @@ static __net_initdata struct pernet_oper +@@ -3042,6 +3042,8 @@ static __net_initdata struct pernet_oper static int __init proto_init(void) { -- cgit v1.1