diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-07-09 11:21:04 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-07-09 17:00:59 +0200 |
| commit | 687977bfc9d750bac5e92e106d77406cd0682141 (patch) | |
| tree | 25580ea10a8eaf39f1e707820269e5e33973f459 /target/linux/generic/pending-4.14/630-packet_socket_type.patch | |
| parent | 6ee6c97ded2d8de72373e25020b11f6484959fdb (diff) | |
| download | upstream-687977bfc9d750bac5e92e106d77406cd0682141.tar.gz upstream-687977bfc9d750bac5e92e106d77406cd0682141.tar.bz2 upstream-687977bfc9d750bac5e92e106d77406cd0682141.zip | |
kernel: bump 4.14 to 4.14.132
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/630-packet_socket_type.patch')
| -rw-r--r-- | target/linux/generic/pending-4.14/630-packet_socket_type.patch | 8 |
1 files changed, 4 insertions, 4 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 0b9addc36e..57b076c559 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; -@@ -3273,6 +3275,7 @@ static int packet_create(struct net *net +@@ -3287,6 +3289,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; -@@ -3886,6 +3889,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3900,6 +3903,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; } -@@ -3938,6 +3951,13 @@ static int packet_getsockopt(struct sock +@@ -3952,6 +3965,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; @@ -128,7 +128,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> break; --- a/net/packet/internal.h +++ b/net/packet/internal.h -@@ -131,6 +131,7 @@ struct packet_sock { +@@ -132,6 +132,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; |