|
|
|
@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
|
|
|
#define PACKET_FANOUT_LB 1
|
|
|
|
|
--- a/net/packet/af_packet.c
|
|
|
|
|
+++ b/net/packet/af_packet.c
|
|
|
|
|
@@ -1780,6 +1780,7 @@ static int packet_rcv_spkt(struct sk_buf
|
|
|
|
|
@@ -1781,6 +1781,7 @@ static int packet_rcv_spkt(struct sk_buf
|
|
|
|
|
{
|
|
|
|
|
struct sock *sk;
|
|
|
|
|
struct sockaddr_pkt *spkt;
|
|
|
|
@ -38,7 +38,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* When we registered the protocol we saved the socket in the data
|
|
|
|
|
@@ -1787,6 +1788,7 @@ static int packet_rcv_spkt(struct sk_buf
|
|
|
|
|
@@ -1788,6 +1789,7 @@ static int packet_rcv_spkt(struct sk_buf
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
sk = pt->af_packet_priv;
|
|
|
|
@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Yank back the headers [hope the device set this
|
|
|
|
|
@@ -1799,7 +1801,7 @@ static int packet_rcv_spkt(struct sk_buf
|
|
|
|
|
@@ -1800,7 +1802,7 @@ static int packet_rcv_spkt(struct sk_buf
|
|
|
|
|
* so that this procedure is noop.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
@ -55,7 +55,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
|
|
if (!net_eq(dev_net(dev), sock_net(sk)))
|
|
|
|
|
@@ -2037,12 +2039,12 @@ static int packet_rcv(struct sk_buff *sk
|
|
|
|
|
@@ -2038,12 +2040,12 @@ static int packet_rcv(struct sk_buff *sk
|
|
|
|
|
unsigned int snaplen, res;
|
|
|
|
|
bool is_drop_n_account = false;
|
|
|
|
|
|
|
|
|
@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
|
|
|
if (!net_eq(dev_net(dev), sock_net(sk)))
|
|
|
|
|
goto drop;
|
|
|
|
|
|
|
|
|
|
@@ -2168,12 +2170,12 @@ static int tpacket_rcv(struct sk_buff *s
|
|
|
|
|
@@ -2169,12 +2171,12 @@ static int tpacket_rcv(struct sk_buff *s
|
|
|
|
|
BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32);
|
|
|
|
|
BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48);
|
|
|
|
|
|
|
|
|
@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
|
|
|
if (!net_eq(dev_net(dev), sock_net(sk)))
|
|
|
|
|
goto drop;
|
|
|
|
|
|
|
|
|
|
@@ -3291,6 +3293,7 @@ static int packet_create(struct net *net
|
|
|
|
|
@@ -3292,6 +3294,7 @@ static int packet_create(struct net *net
|
|
|
|
|
mutex_init(&po->pg_vec_lock);
|
|
|
|
|
po->rollover = NULL;
|
|
|
|
|
po->prot_hook.func = packet_rcv;
|
|
|
|
@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
|
|
|
|
|
|
|
|
if (sock->type == SOCK_PACKET)
|
|
|
|
|
po->prot_hook.func = packet_rcv_spkt;
|
|
|
|
|
@@ -3904,6 +3907,16 @@ packet_setsockopt(struct socket *sock, i
|
|
|
|
|
@@ -3905,6 +3908,16 @@ packet_setsockopt(struct socket *sock, i
|
|
|
|
|
po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
|
|
|
default:
|
|
|
|
|
return -ENOPROTOOPT;
|
|
|
|
|
}
|
|
|
|
|
@@ -3956,6 +3969,13 @@ static int packet_getsockopt(struct sock
|
|
|
|
|
@@ -3957,6 +3970,13 @@ static int packet_getsockopt(struct sock
|
|
|
|
|
case PACKET_VNET_HDR:
|
|
|
|
|
val = po->has_vnet_hdr;
|
|
|
|
|
break;
|
|
|
|
|