dumalogiya
/
openwrt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel: update kernel 4.4 to 4.4.56

Browse Source 
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
v19.07.3_mercusys_ac12_duma
Hauke Mehrtens 7 years ago
parent ea1855949b
commit 88b125e9a4
15 changed files with 25 additions and 58 deletions
Show Stats Download Patch File Download Diff File

4
include/kernel-version.mk
Unescape Escape View File

@ -3,11 +3,11 @@
LINUX_RELEASE?=1 LINUX_RELEASE?=1
LINUX_VERSION-3.18 = .43 LINUX_VERSION-3.18 = .43
LINUX_VERSION-4.4 = .53 LINUX_VERSION-4.4 = .56
LINUX_VERSION-4.9 = .14 LINUX_VERSION-4.9 = .14
LINUX_KERNEL_HASH-3.18.43 = 1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c LINUX_KERNEL_HASH-3.18.43 = 1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c
LINUX_KERNEL_HASH-4.4.53 = 7efecdd5d47c173fc54bbefa5f78e31782532cfa8dbc0df47473e87e35cdf3e6 LINUX_KERNEL_HASH-4.4.56 = 55181e24869e4b550ef756eecd1ab4f6774228c457f4830e9e779c6db4c2a2b6
LINUX_KERNEL_HASH-4.9.14 = 534d343f4ca5c55d7214694a2a378897e8ee2adf576563f069da010093b3b640 LINUX_KERNEL_HASH-4.9.14 = 534d343f4ca5c55d7214694a2a378897e8ee2adf576563f069da010093b3b640
ifdef KERNEL_PATCHVER ifdef KERNEL_PATCHVER

2
target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
Unescape Escape View File

@ -214,7 +214,7 @@
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/ipv6.h> #include <linux/ipv6.h>
#include <linux/icmpv6.h> #include <linux/icmpv6.h>
@@ -779,10 +780,10 @@ static void tcp_v6_send_response(const s @@ -781,10 +782,10 @@ static void tcp_v6_send_response(const s
topt = (__be32 *)(t1 + 1); topt = (__be32 *)(t1 + 1);
if (tsecr) { if (tsecr) {

4
target/linux/generic/patches-4.4/120-bridge_allow_receiption_on_disabled_port.patch
Unescape Escape View File

@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/bridge/br_input.c --- a/net/bridge/br_input.c
+++ b/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) 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); struct net_bridge_port *p = br_port_get_rcu(skb->dev);
@ -33,7 +33,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
return 0; /* process further */ 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: forward:
switch (p->state) { switch (p->state) {

6
target/linux/generic/patches-4.4/630-packet_socket_type.patch
Unescape Escape View File

@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!net_eq(dev_net(dev), sock_net(sk))) if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop; 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); mutex_init(&po->pg_vec_lock);
po->rollover = NULL; po->rollover = NULL;
po->prot_hook.func = packet_rcv; po->prot_hook.func = packet_rcv;
@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (sock->type == SOCK_PACKET) if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt; 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; po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
return 0; return 0;
} }
@ -108,7 +108,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
default: default:
return -ENOPROTOOPT; 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: case PACKET_VNET_HDR:
val = po->has_vnet_hdr; val = po->has_vnet_hdr;
break; break;

2
target/linux/generic/patches-4.4/640-bridge_no_eap_forward.patch
Unescape Escape View File

@ -8,7 +8,7 @@ each other via bridges.
--- ---
--- a/net/bridge/br_input.c --- a/net/bridge/br_input.c
+++ b/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)) if (IS_ENABLED(CONFIG_INET) && skb->protocol == htons(ETH_P_ARP))
br_do_proxy_arp(skb, br, vid, p); br_do_proxy_arp(skb, br, vid, p);

2
target/linux/generic/patches-4.4/641-bridge_always_accept_eap.patch
Unescape Escape View File

@ -6,7 +6,7 @@ issues with WDS.
--- ---
--- a/net/bridge/br_input.c --- a/net/bridge/br_input.c
+++ b/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)) br_multicast_rcv(br, p, skb, vid))
goto drop; goto drop;

2
target/linux/generic/patches-4.4/642-bridge_port_isolate.patch
Unescape Escape View File

@ -48,7 +48,7 @@ Isolating individual bridge ports
--- a/net/bridge/br_input.c --- a/net/bridge/br_input.c
+++ b/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; unicast = false;
br->dev->stats.multicast++; br->dev->stats.multicast++;

5
target/linux/generic/patches-4.4/653-disable_netlink_trim.patch
Unescape Escape View File

@ -1,15 +1,12 @@
--- a/net/netlink/af_netlink.c --- a/net/netlink/af_netlink.c
+++ b/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) static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation)
{ {
- int delta; - int delta;
- -
WARN_ON(skb->sk != NULL); WARN_ON(skb->sk != NULL);
- if (netlink_skb_is_mmaped(skb))
- return skb;
-
- delta = skb->end - skb->tail; - delta = skb->end - skb->tail;
- if (is_vmalloc_addr(skb->head) || delta * 2 < skb->truesize) - if (is_vmalloc_addr(skb->head) || delta * 2 < skb->truesize)
- return skb; - return skb;

10
target/linux/generic/patches-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
Unescape Escape View File

@ -17,7 +17,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/core/dev.c --- a/net/core/dev.c
+++ b/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; enum gro_result ret;
int grow; int grow;
@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!(skb->dev->features & NETIF_F_GRO)) if (!(skb->dev->features & NETIF_F_GRO))
goto normal; 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); &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, static int __netdev_upper_dev_link(struct net_device *dev,
struct net_device *upper_dev, bool master, struct net_device *upper_dev, bool master,
void *private) 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; goto rollback_lower_mesh;
} }
@ -84,7 +84,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
&changeupper_info.info); &changeupper_info.info);
return 0; 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) list_for_each_entry(i, &upper_dev->all_adj_list.upper, list)
__netdev_adjacent_dev_unlink(dev, i->dev, i->ref_nr); __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_info(NETDEV_CHANGEUPPER, dev, call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
&changeupper_info.info); &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) if (err)
return err; return err;
dev->addr_assign_type = NET_ADDR_SET; dev->addr_assign_type = NET_ADDR_SET;

2
target/linux/generic/patches-4.4/721-phy_packets.patch
Unescape Escape View File

@ -86,7 +86,7 @@
help help
--- a/net/core/dev.c --- a/net/core/dev.c
+++ b/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)) if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all))
dev_queue_xmit_nit(skb, dev); dev_queue_xmit_nit(skb, dev);

2
target/linux/generic/patches-4.4/901-debloat_sock_diag.patch
Unescape Escape View File

@ -59,7 +59,7 @@
Support for UNIX socket monitoring interface used by the ss tool. Support for UNIX socket monitoring interface used by the ss tool.
--- a/net/netlink/Kconfig --- a/net/netlink/Kconfig
+++ b/net/netlink/Kconfig +++ b/net/netlink/Kconfig
@@ -13,6 +13,7 @@ config NETLINK_MMAP @@ -4,6 +4,7 @@
config NETLINK_DIAG config NETLINK_DIAG
tristate "NETLINK: socket monitoring interface" tristate "NETLINK: socket monitoring interface"

4
target/linux/ramips/patches-4.4/0010-MIPS-ralink-Add-a-few-missing-clocks.patch
Unescape Escape View File

@ -28,7 +28,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
if (IS_ENABLED(CONFIG_USB) && is_mt76x8()) { if (IS_ENABLED(CONFIG_USB) && is_mt76x8()) {
--- a/arch/mips/ralink/rt305x.c --- a/arch/mips/ralink/rt305x.c
+++ b/arch/mips/ralink/rt305x.c +++ b/arch/mips/ralink/rt305x.c
@@ -201,6 +201,7 @@ void __init ralink_clk_init(void) @@ -190,6 +190,7 @@ void __init ralink_clk_init(void)
ralink_clk_add("cpu", cpu_rate); ralink_clk_add("cpu", cpu_rate);
ralink_clk_add("sys", sys_rate); ralink_clk_add("sys", sys_rate);
ralink_clk_add("10000b00.spi", sys_rate); ralink_clk_add("10000b00.spi", sys_rate);
@ -38,7 +38,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
ralink_clk_add("10000500.uart", uart_rate); ralink_clk_add("10000500.uart", uart_rate);
--- a/arch/mips/ralink/rt3883.c --- a/arch/mips/ralink/rt3883.c
+++ b/arch/mips/ralink/rt3883.c +++ b/arch/mips/ralink/rt3883.c
@@ -109,6 +109,7 @@ void __init ralink_clk_init(void) @@ -99,6 +99,7 @@ void __init ralink_clk_init(void)
ralink_clk_add("10000120.watchdog", sys_rate); ralink_clk_add("10000120.watchdog", sys_rate);
ralink_clk_add("10000500.uart", 40000000); ralink_clk_add("10000500.uart", 40000000);
ralink_clk_add("10000b00.spi", sys_rate); ralink_clk_add("10000b00.spi", sys_rate);

30
target/linux/ramips/patches-4.4/0068-fix-ralink-prom.patch
Unescape Escape View File

@ -1,30 +0,0 @@
--- a/arch/mips/ralink/prom.c
+++ b/arch/mips/ralink/prom.c
@@ -30,8 +30,10 @@ const char *get_system_type(void)
return soc_info.sys_type;
}
-static __init void prom_init_cmdline(int argc, char **argv)
+static __init void prom_init_cmdline(void)
{
+ int argc;
+ char **argv;
int i;
pr_debug("prom: fw_arg0=%08x fw_arg1=%08x fw_arg2=%08x fw_arg3=%08x\n",
@@ -60,14 +62,11 @@ static __init void prom_init_cmdline(int
void __init prom_init(void)
{
- int argc;
- char **argv;
-
prom_soc_init(&soc_info);
pr_info("SoC Type: %s\n", get_system_type());
- prom_init_cmdline(argc, argv);
+ prom_init_cmdline();
}
void __init prom_free_prom_memory(void)

2
target/linux/ramips/patches-4.4/0081-MIPS-ralink-Fix-invalid-assignment-of-SoC-type.patch
Unescape Escape View File

@ -16,7 +16,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
--- a/arch/mips/ralink/rt288x.c --- a/arch/mips/ralink/rt288x.c
+++ b/arch/mips/ralink/rt288x.c +++ b/arch/mips/ralink/rt288x.c
@@ -119,5 +119,5 @@ void prom_soc_init(struct ralink_soc_inf @@ -109,5 +109,5 @@ void prom_soc_init(struct ralink_soc_inf
soc_info->mem_size_max = RT2880_MEM_SIZE_MAX; soc_info->mem_size_max = RT2880_MEM_SIZE_MAX;
rt2880_pinmux_data = rt2880_pinmux_data_act; rt2880_pinmux_data = rt2880_pinmux_data_act;

6
target/linux/ramips/patches-4.4/0720-arch-mips-ralink-add-i2c-clocks.patch
Unescape Escape View File

@ -35,7 +35,7 @@
ralink_clk_add("10000c00.uartlite", periph_rate); ralink_clk_add("10000c00.uartlite", periph_rate);
--- a/arch/mips/ralink/rt288x.c --- a/arch/mips/ralink/rt288x.c
+++ b/arch/mips/ralink/rt288x.c +++ b/arch/mips/ralink/rt288x.c
@@ -75,6 +75,7 @@ void __init ralink_clk_init(void) @@ -65,6 +65,7 @@ void __init ralink_clk_init(void)
ralink_clk_add("300100.timer", cpu_rate / 2); ralink_clk_add("300100.timer", cpu_rate / 2);
ralink_clk_add("300120.watchdog", cpu_rate / 2); ralink_clk_add("300120.watchdog", cpu_rate / 2);
ralink_clk_add("300500.uart", cpu_rate / 2); ralink_clk_add("300500.uart", cpu_rate / 2);
@ -45,7 +45,7 @@
ralink_clk_add("480000.wmac", wmac_rate); ralink_clk_add("480000.wmac", wmac_rate);
--- a/arch/mips/ralink/rt305x.c --- a/arch/mips/ralink/rt305x.c
+++ b/arch/mips/ralink/rt305x.c +++ b/arch/mips/ralink/rt305x.c
@@ -200,6 +200,8 @@ void __init ralink_clk_init(void) @@ -189,6 +189,8 @@ void __init ralink_clk_init(void)
ralink_clk_add("cpu", cpu_rate); ralink_clk_add("cpu", cpu_rate);
ralink_clk_add("sys", sys_rate); ralink_clk_add("sys", sys_rate);
@ -56,7 +56,7 @@
ralink_clk_add("10000100.timer", wdt_rate); ralink_clk_add("10000100.timer", wdt_rate);
--- a/arch/mips/ralink/rt3883.c --- a/arch/mips/ralink/rt3883.c
+++ b/arch/mips/ralink/rt3883.c +++ b/arch/mips/ralink/rt3883.c
@@ -108,6 +108,8 @@ void __init ralink_clk_init(void) @@ -98,6 +98,8 @@ void __init ralink_clk_init(void)
ralink_clk_add("10000100.timer", sys_rate); ralink_clk_add("10000100.timer", sys_rate);
ralink_clk_add("10000120.watchdog", sys_rate); ralink_clk_add("10000120.watchdog", sys_rate);
ralink_clk_add("10000500.uart", 40000000); ralink_clk_add("10000500.uart", 40000000);

Write Preview
Loading…
Cancel
Save