diff options
Diffstat (limited to 'target/linux/generic/pending-4.9/630-packet_socket_type.patch')
-rw-r--r-- | target/linux/generic/pending-4.9/630-packet_socket_type.patch | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/target/linux/generic/pending-4.9/630-packet_socket_type.patch b/target/linux/generic/pending-4.9/630-packet_socket_type.patch index 5afee1e3cf..6aec1d286f 100644 --- a/target/linux/generic/pending-4.9/630-packet_socket_type.patch +++ b/target/linux/generic/pending-4.9/630-packet_socket_type.patch @@ -9,8 +9,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> net/packet/internal.h | 1 + 3 files changed, 31 insertions(+), 7 deletions(-) -diff --git a/include/uapi/linux/if_packet.h b/include/uapi/linux/if_packet.h -index 9e7edfd8141e..40fdf8907900 100644 --- a/include/uapi/linux/if_packet.h +++ b/include/uapi/linux/if_packet.h @@ -31,6 +31,8 @@ struct sockaddr_ll { @@ -30,11 +28,9 @@ index 9e7edfd8141e..40fdf8907900 100644 #define PACKET_FANOUT_HASH 0 #define PACKET_FANOUT_LB 1 -diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c -index 6a563e6e24de..e412c5a4f6d4 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c -@@ -1772,6 +1772,7 @@ static int packet_rcv_spkt(struct sk_buff *skb, struct net_device *dev, +@@ -1772,6 +1772,7 @@ static int packet_rcv_spkt(struct sk_buf { struct sock *sk; struct sockaddr_pkt *spkt; @@ -42,7 +38,7 @@ index 6a563e6e24de..e412c5a4f6d4 100644 /* * When we registered the protocol we saved the socket in the data -@@ -1779,6 +1780,7 @@ static int packet_rcv_spkt(struct sk_buff *skb, struct net_device *dev, +@@ -1779,6 +1780,7 @@ static int packet_rcv_spkt(struct sk_buf */ sk = pt->af_packet_priv; @@ -50,7 +46,7 @@ index 6a563e6e24de..e412c5a4f6d4 100644 /* * Yank back the headers [hope the device set this -@@ -1791,7 +1793,7 @@ static int packet_rcv_spkt(struct sk_buff *skb, struct net_device *dev, +@@ -1791,7 +1793,7 @@ static int packet_rcv_spkt(struct sk_buf * so that this procedure is noop. */ @@ -59,7 +55,7 @@ index 6a563e6e24de..e412c5a4f6d4 100644 goto out; if (!net_eq(dev_net(dev), sock_net(sk))) -@@ -2029,12 +2031,12 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, +@@ -2029,12 +2031,12 @@ static int packet_rcv(struct sk_buff *sk unsigned int snaplen, res; bool is_drop_n_account = false; @@ -75,7 +71,7 @@ index 6a563e6e24de..e412c5a4f6d4 100644 if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -2159,12 +2161,12 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, +@@ -2159,12 +2161,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); @@ -91,7 +87,7 @@ index 6a563e6e24de..e412c5a4f6d4 100644 if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -3234,6 +3236,7 @@ static int packet_create(struct net *net, struct socket *sock, int protocol, +@@ -3234,6 +3236,7 @@ static int packet_create(struct net *net mutex_init(&po->pg_vec_lock); po->rollover = NULL; po->prot_hook.func = packet_rcv; @@ -99,7 +95,7 @@ index 6a563e6e24de..e412c5a4f6d4 100644 if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3815,6 +3818,16 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optv +@@ -3820,6 +3823,16 @@ packet_setsockopt(struct socket *sock, i po->xmit = val ? packet_direct_xmit : dev_queue_xmit; return 0; } @@ -116,7 +112,7 @@ index 6a563e6e24de..e412c5a4f6d4 100644 default: return -ENOPROTOOPT; } -@@ -3867,6 +3880,13 @@ static int packet_getsockopt(struct socket *sock, int level, int optname, +@@ -3872,6 +3885,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; @@ -130,8 +126,6 @@ index 6a563e6e24de..e412c5a4f6d4 100644 case PACKET_VERSION: val = po->tp_version; break; -diff --git a/net/packet/internal.h b/net/packet/internal.h -index 9ee46314b7d7..76c895fcf22f 100644 --- a/net/packet/internal.h +++ b/net/packet/internal.h @@ -129,6 +129,7 @@ struct packet_sock { @@ -142,6 +136,3 @@ index 9ee46314b7d7..76c895fcf22f 100644 }; static struct packet_sock *pkt_sk(struct sock *sk) --- -2.11.0 - |