aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.39/630-packet_socket_type.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2011-08-16 22:04:10 +0000
committerHauke Mehrtens <hauke@openwrt.org>2011-08-16 22:04:10 +0000
commitff1d70f47d8e8e6516bab8ff3783bbd316e38d26 (patch)
tree829769cc85fa2bda15a276e8b26e2a3136871b75 /target/linux/generic/patches-2.6.39/630-packet_socket_type.patch
parentebe790046ad007f288987f3d0ccc8372262508f3 (diff)
downloadmaster-187ad058-ff1d70f47d8e8e6516bab8ff3783bbd316e38d26.tar.gz
master-187ad058-ff1d70f47d8e8e6516bab8ff3783bbd316e38d26.tar.bz2
master-187ad058-ff1d70f47d8e8e6516bab8ff3783bbd316e38d26.zip
kernel: update kernel to version 2.6.39.4
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28022 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.39/630-packet_socket_type.patch')
-rw-r--r--target/linux/generic/patches-2.6.39/630-packet_socket_type.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-2.6.39/630-packet_socket_type.patch b/target/linux/generic/patches-2.6.39/630-packet_socket_type.patch
index 75b61290c3..122a108048 100644
--- a/target/linux/generic/patches-2.6.39/630-packet_socket_type.patch
+++ b/target/linux/generic/patches-2.6.39/630-packet_socket_type.patch
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
-@@ -1523,6 +1526,7 @@ static int packet_create(struct net *net
+@@ -1524,6 +1527,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;
@@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt;
-@@ -2091,6 +2095,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -2093,6 +2097,16 @@ packet_setsockopt(struct socket *sock, i
po->tp_tstamp = val;
return 0;
}
@@ -116,7 +116,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
default:
return -ENOPROTOOPT;
}
-@@ -2148,6 +2162,13 @@ static int packet_getsockopt(struct sock
+@@ -2150,6 +2164,13 @@ static int packet_getsockopt(struct sock
data = &val;
break;