aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/630-packet_socket_type.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2015-11-01 13:45:57 +0000
committerHauke Mehrtens <hauke@openwrt.org>2015-11-01 13:45:57 +0000
commitd595b22a02a1bd0fb1b17c0ca9dbd53f43e5acb8 (patch)
tree4c4761c7e11bc9aa6c488115d01c5d5571c55891 /target/linux/generic/patches-3.18/630-packet_socket_type.patch
parent1fbd57847233460e2868775d51613aa33ab03548 (diff)
downloadmaster-187ad058-d595b22a02a1bd0fb1b17c0ca9dbd53f43e5acb8.tar.gz
master-187ad058-d595b22a02a1bd0fb1b17c0ca9dbd53f43e5acb8.tar.bz2
master-187ad058-d595b22a02a1bd0fb1b17c0ca9dbd53f43e5acb8.zip
kernel: update kernel 3.18 to version 3.18.23
Changelog: * https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.22 * https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.23 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47334 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/630-packet_socket_type.patch')
-rw-r--r--target/linux/generic/patches-3.18/630-packet_socket_type.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.18/630-packet_socket_type.patch b/target/linux/generic/patches-3.18/630-packet_socket_type.patch
index fa057b264d..31f4bca2a0 100644
--- a/target/linux/generic/patches-3.18/630-packet_socket_type.patch
+++ b/target/linux/generic/patches-3.18/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;
-@@ -2809,6 +2811,7 @@ static int packet_create(struct net *net
+@@ -2807,6 +2809,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;
-@@ -3389,6 +3392,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -3387,6 +3390,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;
}
-@@ -3440,6 +3453,13 @@ static int packet_getsockopt(struct sock
+@@ -3438,6 +3451,13 @@ static int packet_getsockopt(struct sock
case PACKET_VNET_HDR:
val = po->has_vnet_hdr;
break;