refresh the packet socket patch for 2.6.29
SVN-Revision: 15511
This commit is contained in:
parent
a036aca55c
commit
270e4ea27b
1 changed files with 3 additions and 3 deletions
|
@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
||||||
if (dev_net(dev) != sock_net(sk))
|
if (dev_net(dev) != sock_net(sk))
|
||||||
goto drop;
|
goto drop;
|
||||||
|
|
||||||
@@ -1072,6 +1075,7 @@ static int packet_create(struct net *net
|
@@ -1073,6 +1076,7 @@ static int packet_create(struct net *net
|
||||||
spin_lock_init(&po->bind_lock);
|
spin_lock_init(&po->bind_lock);
|
||||||
mutex_init(&po->pg_vec_lock);
|
mutex_init(&po->pg_vec_lock);
|
||||||
po->prot_hook.func = packet_rcv;
|
po->prot_hook.func = packet_rcv;
|
||||||
|
@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
||||||
|
|
||||||
if (sock->type == SOCK_PACKET)
|
if (sock->type == SOCK_PACKET)
|
||||||
po->prot_hook.func = packet_rcv_spkt;
|
po->prot_hook.func = packet_rcv_spkt;
|
||||||
@@ -1411,6 +1415,16 @@ packet_setsockopt(struct socket *sock, i
|
@@ -1413,6 +1417,16 @@ packet_setsockopt(struct socket *sock, i
|
||||||
ret = packet_mc_drop(sk, &mreq);
|
ret = packet_mc_drop(sk, &mreq);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -116,7 +116,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
||||||
|
|
||||||
#ifdef CONFIG_PACKET_MMAP
|
#ifdef CONFIG_PACKET_MMAP
|
||||||
case PACKET_RX_RING:
|
case PACKET_RX_RING:
|
||||||
@@ -1542,6 +1556,13 @@ static int packet_getsockopt(struct sock
|
@@ -1544,6 +1558,13 @@ static int packet_getsockopt(struct sock
|
||||||
|
|
||||||
data = &val;
|
data = &val;
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue