diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-10-04 11:34:39 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-10-04 11:34:39 +0000 |
commit | 0cd478518fd2333cb6a33e134b4e15eb4efd5eb3 (patch) | |
tree | d0a1a756d8b4469d550ffbd17f0c7dd8300ecb82 /target/linux/generic/patches-4.1/630-packet_socket_type.patch | |
parent | dea417017edc6717e2662ab97b0af3d0b724d360 (diff) | |
download | mtk-20170518-0cd478518fd2333cb6a33e134b4e15eb4efd5eb3.zip mtk-20170518-0cd478518fd2333cb6a33e134b4e15eb4efd5eb3.tar.gz mtk-20170518-0cd478518fd2333cb6a33e134b4e15eb4efd5eb3.tar.bz2 |
kernel: update 4.1 to 4.1.10
Fixes a regression on spi flash devices (upstream commit 1583eaece6fa).
Changelogs:
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.7
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.8
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.9
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.10
096-ipv4-off-by-one-in-continuation-handling-in-proc-net.patch was applied
upstream and dropped.
Signed-off-by: Mathias Kresin <openwrt@kresin.me>
[update from 4.1.9 to 4.1.10]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 47104
Diffstat (limited to 'target/linux/generic/patches-4.1/630-packet_socket_type.patch')
-rw-r--r-- | target/linux/generic/patches-4.1/630-packet_socket_type.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-4.1/630-packet_socket_type.patch b/target/linux/generic/patches-4.1/630-packet_socket_type.patch index 9fb9a40..ca6ce29 100644 --- a/target/linux/generic/patches-4.1/630-packet_socket_type.patch +++ b/target/linux/generic/patches-4.1/630-packet_socket_type.patch @@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -2852,6 +2854,7 @@ static int packet_create(struct net *net +@@ -2851,6 +2853,7 @@ static int packet_create(struct net *net spin_lock_init(&po->bind_lock); mutex_init(&po->pg_vec_lock); po->prot_hook.func = packet_rcv; @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3457,6 +3460,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3456,6 +3459,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 <nbd@openwrt.org> default: return -ENOPROTOOPT; } -@@ -3508,6 +3521,13 @@ static int packet_getsockopt(struct sock +@@ -3507,6 +3520,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; |