diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-08-27 12:29:14 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-08-28 13:08:20 +0200 |
| commit | b5407887bc67efb92e8a3beda81e372e1ad38dce (patch) | |
| tree | 812aaff84a2154beb20ba7af26e1cf00d773c4bb /target/linux/generic/pending-4.14 | |
| parent | b32c77004cf430e3306936ebcb37e0fcb2f61732 (diff) | |
| download | upstream-b5407887bc67efb92e8a3beda81e372e1ad38dce.tar.gz upstream-b5407887bc67efb92e8a3beda81e372e1ad38dce.tar.bz2 upstream-b5407887bc67efb92e8a3beda81e372e1ad38dce.zip | |
kernel: bump 4.14 to 4.14.140
Refreshed all patches.
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-4.14')
| -rw-r--r-- | target/linux/generic/pending-4.14/630-packet_socket_type.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/pending-4.14/630-packet_socket_type.patch b/target/linux/generic/pending-4.14/630-packet_socket_type.patch index 57b076c559..8dbe06023e 100644 --- a/target/linux/generic/pending-4.14/630-packet_socket_type.patch +++ b/target/linux/generic/pending-4.14/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; -@@ -3287,6 +3289,7 @@ static int packet_create(struct net *net +@@ -3294,6 +3296,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; -@@ -3900,6 +3903,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3907,6 +3910,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; } -@@ -3952,6 +3965,13 @@ static int packet_getsockopt(struct sock +@@ -3959,6 +3972,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; |