|
|
|
|
@ -26,7 +26,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
|
|
|
|
#define PACKET_FANOUT_LB 1
|
|
|
|
|
--- a/net/packet/af_packet.c
|
|
|
|
|
+++ b/net/packet/af_packet.c
|
|
|
|
|
@@ -1403,6 +1403,7 @@ static int packet_rcv_spkt(struct sk_buf
|
|
|
|
|
@@ -1404,6 +1404,7 @@ static int packet_rcv_spkt(struct sk_buf
|
|
|
|
|
{
|
|
|
|
|
struct sock *sk;
|
|
|
|
|
struct sockaddr_pkt *spkt;
|
|
|
|
|
@ -34,7 +34,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* When we registered the protocol we saved the socket in the data
|
|
|
|
|
@@ -1410,6 +1411,7 @@ static int packet_rcv_spkt(struct sk_buf
|
|
|
|
|
@@ -1411,6 +1412,7 @@ static int packet_rcv_spkt(struct sk_buf
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
sk = pt->af_packet_priv;
|
|
|
|
|
@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Yank back the headers [hope the device set this
|
|
|
|
|
@@ -1422,7 +1424,7 @@ static int packet_rcv_spkt(struct sk_buf
|
|
|
|
|
@@ -1423,7 +1425,7 @@ static int packet_rcv_spkt(struct sk_buf
|
|
|
|
|
* so that this procedure is noop.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
@ -51,7 +51,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
|
|
if (!net_eq(dev_net(dev), sock_net(sk)))
|
|
|
|
|
@@ -1629,12 +1631,12 @@ static int packet_rcv(struct sk_buff *sk
|
|
|
|
|
@@ -1630,12 +1632,12 @@ static int packet_rcv(struct sk_buff *sk
|
|
|
|
|
int skb_len = skb->len;
|
|
|
|
|
unsigned int snaplen, res;
|
|
|
|
|
|
|
|
|
|
@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
|
|
|
|
if (!net_eq(dev_net(dev), sock_net(sk)))
|
|
|
|
|
goto drop;
|
|
|
|
|
|
|
|
|
|
@@ -1747,12 +1749,12 @@ static int tpacket_rcv(struct sk_buff *s
|
|
|
|
|
@@ -1748,12 +1750,12 @@ static int tpacket_rcv(struct sk_buff *s
|
|
|
|
|
struct timespec ts;
|
|
|
|
|
__u32 ts_status;
|
|
|
|
|
|
|
|
|
|
@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
|
|
|
|
if (!net_eq(dev_net(dev), sock_net(sk)))
|
|
|
|
|
goto drop;
|
|
|
|
|
|
|
|
|
|
@@ -2641,6 +2643,7 @@ static int packet_create(struct net *net
|
|
|
|
|
@@ -2654,6 +2656,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;
|
|
|
|
|
@@ -3251,6 +3254,16 @@ packet_setsockopt(struct socket *sock, i
|
|
|
|
|
@@ -3264,6 +3267,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;
|
|
|
|
|
}
|
|
|
|
|
@@ -3302,6 +3315,13 @@ static int packet_getsockopt(struct sock
|
|
|
|
|
@@ -3315,6 +3328,13 @@ static int packet_getsockopt(struct sock
|
|
|
|
|
case PACKET_VNET_HDR:
|
|
|
|
|
val = po->has_vnet_hdr;
|
|
|
|
|
break;
|
|
|
|
|
@ -124,7 +124,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
|
|
|
|
break;
|
|
|
|
|
--- a/net/packet/internal.h
|
|
|
|
|
+++ b/net/packet/internal.h
|
|
|
|
|
@@ -115,6 +115,7 @@ struct packet_sock {
|
|
|
|
|
@@ -116,6 +116,7 @@ struct packet_sock {
|
|
|
|
|
unsigned int tp_tstamp;
|
|
|
|
|
struct net_device __rcu *cached_dev;
|
|
|
|
|
struct packet_type prot_hook ____cacheline_aligned_in_smp;
|
|
|
|
|
|
Felix Fietkau
10 years ago