aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.9/630-packet_socket_type.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-05-13 10:54:43 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-05-15 11:28:40 +0200
commitf053a8ce415da2e276dfd54288a02a98a819d09e (patch)
tree40194814144c7543fb3f8f3d4c1cdfa7ceee4d2c /target/linux/generic/pending-4.9/630-packet_socket_type.patch
parent412d80cdb7a3a9fc610dbdd29529b06c63c36a62 (diff)
downloadupstream-f053a8ce415da2e276dfd54288a02a98a819d09e.tar.gz
upstream-f053a8ce415da2e276dfd54288a02a98a819d09e.tar.bz2
upstream-f053a8ce415da2e276dfd54288a02a98a819d09e.zip
kernel: bump 4.9 to 4.9.175
Refreshed all patches. Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
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.patch6
1 files changed, 3 insertions, 3 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 13a544736d..018d006929 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
@@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
-@@ -3266,6 +3268,7 @@ static int packet_create(struct net *net
+@@ -3270,6 +3272,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;
-@@ -3879,6 +3882,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -3883,6 +3886,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;
}
-@@ -3931,6 +3944,13 @@ static int packet_getsockopt(struct sock
+@@ -3935,6 +3948,13 @@ static int packet_getsockopt(struct sock
case PACKET_VNET_HDR:
val = po->has_vnet_hdr;
break;