aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.1/630-packet_socket_type.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2015-10-04 11:34:39 +0000
committerHauke Mehrtens <hauke@openwrt.org>2015-10-04 11:34:39 +0000
commit94fab5804b6f68cf2c606b57866c2cb12306cbf2 (patch)
tree643feda132ba5907f45408bc191b4501a4918284 /target/linux/generic/patches-4.1/630-packet_socket_type.patch
parent145a1573469c39ebeaedeab2a3df09dea5db85fc (diff)
downloadmaster-187ad058-94fab5804b6f68cf2c606b57866c2cb12306cbf2.tar.gz
master-187ad058-94fab5804b6f68cf2c606b57866c2cb12306cbf2.tar.bz2
master-187ad058-94fab5804b6f68cf2c606b57866c2cb12306cbf2.zip
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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47104 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch6
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 9fb9a400ee..ca6ce297c4 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;