diff options
| author | Ansuel Smith <ansuelsmth@gmail.com> | 2017-02-26 13:42:13 +0100 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2017-02-27 11:39:31 +0100 |
| commit | a0a9ba046492e952aa5cab042d96bec4cab6e17f (patch) | |
| tree | ccf9528ddd68e75086f7e5f1d7328c2da1bd67c3 /target | |
| parent | 3fcc4b656aeafc30221927806e9a3f641b9377f3 (diff) | |
| download | upstream-a0a9ba046492e952aa5cab042d96bec4cab6e17f.tar.gz upstream-a0a9ba046492e952aa5cab042d96bec4cab6e17f.tar.bz2 upstream-a0a9ba046492e952aa5cab042d96bec4cab6e17f.zip | |
kernel: update 4.9 to 4.9.13
refresh patch 630-packet_socket_type
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/generic/patches-4.9/630-packet_socket_type.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/generic/patches-4.9/630-packet_socket_type.patch b/target/linux/generic/patches-4.9/630-packet_socket_type.patch index b40a2d32eb..ebfcb2bd31 100644 --- a/target/linux/generic/patches-4.9/630-packet_socket_type.patch +++ b/target/linux/generic/patches-4.9/630-packet_socket_type.patch @@ -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 -@@ -1759,6 +1759,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1772,6 +1772,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 -@@ -1766,6 +1767,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1779,6 +1780,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 -@@ -1778,7 +1780,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1791,7 +1793,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))) -@@ -2016,12 +2018,12 @@ static int packet_rcv(struct sk_buff *sk +@@ -2029,12 +2031,12 @@ static int packet_rcv(struct sk_buff *sk unsigned int snaplen, res; bool is_drop_n_account = false; @@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -2146,12 +2148,12 @@ static int tpacket_rcv(struct sk_buff *s +@@ -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); @@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -3211,6 +3213,7 @@ static int packet_create(struct net *net +@@ -3230,6 +3232,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; -@@ -3790,6 +3793,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3809,6 +3812,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; } -@@ -3842,6 +3855,13 @@ static int packet_getsockopt(struct sock +@@ -3861,6 +3874,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; |