|
|
|
|
@ -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
|
|
|
|
|
@@ -1836,6 +1836,7 @@ static int packet_rcv_spkt(struct sk_buf
|
|
|
|
|
@@ -1838,6 +1838,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
|
|
|
|
|
@@ -1843,6 +1844,7 @@ static int packet_rcv_spkt(struct sk_buf
|
|
|
|
|
@@ -1845,6 +1846,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
|
|
|
|
|
@@ -1855,7 +1857,7 @@ static int packet_rcv_spkt(struct sk_buf
|
|
|
|
|
@@ -1857,7 +1859,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)))
|
|
|
|
|
@@ -2082,12 +2084,12 @@ static int packet_rcv(struct sk_buff *sk
|
|
|
|
|
@@ -2084,12 +2086,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;
|
|
|
|
|
|
|
|
|
|
@@ -2214,12 +2216,12 @@ static int tpacket_rcv(struct sk_buff *s
|
|
|
|
|
@@ -2216,12 +2218,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;
|
|
|
|
|
|
|
|
|
|
@@ -3313,6 +3315,7 @@ static int packet_create(struct net *net
|
|
|
|
|
@@ -3318,6 +3320,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;
|
|
|
|
|
@@ -3935,6 +3938,16 @@ packet_setsockopt(struct socket *sock, i
|
|
|
|
|
@@ -3940,6 +3943,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;
|
|
|
|
|
}
|
|
|
|
|
@@ -3987,6 +4000,13 @@ static int packet_getsockopt(struct sock
|
|
|
|
|
@@ -3992,6 +4005,13 @@ static int packet_getsockopt(struct sock
|
|
|
|
|
case PACKET_VNET_HDR:
|
|
|
|
|
val = po->has_vnet_hdr;
|
|
|
|
|
break;
|
|
|
|
|
|
Hauke Mehrtens
4 years ago