From 0b27fefa6299eb5ef2e663514226528e4ebbd322 Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Tue, 17 Nov 2009 10:06:15 +0000 Subject: refresh 2.6.32 patches with -rc7 SVN-Revision: 18440 --- .../linux/generic-2.6/patches-2.6.32/240-packet_socket_type.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/generic-2.6/patches-2.6.32/240-packet_socket_type.patch') diff --git a/target/linux/generic-2.6/patches-2.6.32/240-packet_socket_type.patch b/target/linux/generic-2.6/patches-2.6.32/240-packet_socket_type.patch index 42fcb9315f..71827643e6 100644 --- a/target/linux/generic-2.6/patches-2.6.32/240-packet_socket_type.patch +++ b/target/linux/generic-2.6/patches-2.6.32/240-packet_socket_type.patch @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau if (dev_net(dev) != sock_net(sk)) goto drop; -@@ -1384,6 +1387,7 @@ static int packet_create(struct net *net +@@ -1381,6 +1384,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 if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -1731,6 +1735,16 @@ packet_setsockopt(struct socket *sock, i +@@ -1728,6 +1732,16 @@ packet_setsockopt(struct socket *sock, i ret = packet_mc_drop(sk, &mreq); return ret; } @@ -116,7 +116,7 @@ Signed-off-by: Felix Fietkau #ifdef CONFIG_PACKET_MMAP case PACKET_RX_RING: -@@ -1876,6 +1890,13 @@ static int packet_getsockopt(struct sock +@@ -1873,6 +1887,13 @@ static int packet_getsockopt(struct sock data = &val; break; -- cgit v1.2.3