summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.8/630-packet_socket_type.patch
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-02-19 09:17:38 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-02-19 09:17:38 +0000
commit8b6ada275e0edeec48fa6f0da3287bda78fb4014 (patch)
treeecb379357c3d559b31c2786ec23d32c5b97f297a /target/linux/generic/patches-3.8/630-packet_socket_type.patch
parent87b345f44e886b3b6883a976e22e479dd68a78b7 (diff)
kernel: update linux 3.8-rcX to 3.8
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35672 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.8/630-packet_socket_type.patch')
-rw-r--r--target/linux/generic/patches-3.8/630-packet_socket_type.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.8/630-packet_socket_type.patch b/target/linux/generic/patches-3.8/630-packet_socket_type.patch
index 921c810f0..0671a28e9 100644
--- a/target/linux/generic/patches-3.8/630-packet_socket_type.patch
+++ b/target/linux/generic/patches-3.8/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;
-@@ -2537,6 +2539,7 @@ static int packet_create(struct net *net
+@@ -2539,6 +2541,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;
-@@ -3150,6 +3153,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -3152,6 +3155,16 @@ packet_setsockopt(struct socket *sock, i
po->tp_tx_has_off = !!val;
return 0;
}
@@ -108,7 +108,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
default:
return -ENOPROTOOPT;
}
-@@ -3204,6 +3217,13 @@ static int packet_getsockopt(struct sock
+@@ -3206,6 +3219,13 @@ static int packet_getsockopt(struct sock
case PACKET_VNET_HDR:
val = po->has_vnet_hdr;
break;