|
@@ -26,7 +26,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
|
|
|
-@@ -1784,6 +1784,7 @@ static int packet_rcv_spkt(struct sk_buf
|
|
|
+@@ -1777,6 +1777,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@nbd.name>
|
|
|
|
|
|
/*
|
|
|
* When we registered the protocol we saved the socket in the data
|
|
|
-@@ -1791,6 +1792,7 @@ static int packet_rcv_spkt(struct sk_buf
|
|
|
+@@ -1784,6 +1785,7 @@ static int packet_rcv_spkt(struct sk_buf
|
|
|
*/
|
|
|
|
|
|
sk = pt->af_packet_priv;
|
|
@@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
|
|
|
|
/*
|
|
|
* Yank back the headers [hope the device set this
|
|
|
-@@ -1803,7 +1805,7 @@ static int packet_rcv_spkt(struct sk_buf
|
|
|
+@@ -1796,7 +1798,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@nbd.name>
|
|
|
goto out;
|
|
|
|
|
|
if (!net_eq(dev_net(dev), sock_net(sk)))
|
|
|
-@@ -2006,12 +2008,12 @@ static int packet_rcv(struct sk_buff *sk
|
|
|
+@@ -1999,12 +2001,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@nbd.name>
|
|
|
if (!net_eq(dev_net(dev), sock_net(sk)))
|
|
|
goto drop;
|
|
|
|
|
|
-@@ -2131,12 +2133,12 @@ static int tpacket_rcv(struct sk_buff *s
|
|
|
+@@ -2124,12 +2126,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);
|
|
|
|
|
@@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
|
if (!net_eq(dev_net(dev), sock_net(sk)))
|
|
|
goto drop;
|
|
|
|
|
|
-@@ -3127,6 +3129,7 @@ static int packet_create(struct net *net
|
|
|
+@@ -3126,6 +3128,7 @@ static int packet_create(struct net *net
|
|
|
mutex_init(&po->pg_vec_lock);
|
|
|
po->rollover = NULL;
|
|
|
po->prot_hook.func = packet_rcv;
|
|
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
|
|
|
|
if (sock->type == SOCK_PACKET)
|
|
|
po->prot_hook.func = packet_rcv_spkt;
|
|
|
-@@ -3756,6 +3759,16 @@ packet_setsockopt(struct socket *sock, i
|
|
|
+@@ -3755,6 +3758,16 @@ packet_setsockopt(struct socket *sock, i
|
|
|
po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
|
|
|
return 0;
|
|
|
}
|
|
@@ -108,7 +108,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
|
default:
|
|
|
return -ENOPROTOOPT;
|
|
|
}
|
|
|
-@@ -3809,6 +3822,13 @@ static int packet_getsockopt(struct sock
|
|
|
+@@ -3807,6 +3820,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@nbd.name>
|
|
|
break;
|
|
|
--- a/net/packet/internal.h
|
|
|
+++ b/net/packet/internal.h
|
|
|
-@@ -129,6 +129,7 @@ struct packet_sock {
|
|
|
+@@ -128,6 +128,7 @@ struct packet_sock {
|
|
|
struct net_device __rcu *cached_dev;
|
|
|
int (*xmit)(struct sk_buff *skb);
|
|
|
struct packet_type prot_hook ____cacheline_aligned_in_smp;
|