diff options
| author | Zoltan Herpai <wigyori@uid0.hu> | 2016-08-24 16:31:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-24 16:31:47 +0200 |
| commit | 166656b1bde4dd4272a631512f226276c3a81d26 (patch) | |
| tree | 6275373cf98ad4f7c44817325bb48bd6e7fd0ef1 /target/linux/generic/patches-3.18/630-packet_socket_type.patch | |
| parent | 7885f022b978ee84eda5559a98dc683bbf0c8f00 (diff) | |
| parent | 83767cf94f909f5932540da7641a12b7dfa71d85 (diff) | |
| download | master-187ad058-166656b1bde4dd4272a631512f226276c3a81d26.tar.gz master-187ad058-166656b1bde4dd4272a631512f226276c3a81d26.tar.bz2 master-187ad058-166656b1bde4dd4272a631512f226276c3a81d26.zip | |
Merge pull request #69 from wigyori/master
Bump legacy 3.18 and 4.1 kernels to latest
Diffstat (limited to 'target/linux/generic/patches-3.18/630-packet_socket_type.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/630-packet_socket_type.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.18/630-packet_socket_type.patch b/target/linux/generic/patches-3.18/630-packet_socket_type.patch index 7502a1c3b4..61ddea84c6 100644 --- a/target/linux/generic/patches-3.18/630-packet_socket_type.patch +++ b/target/linux/generic/patches-3.18/630-packet_socket_type.patch @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3408,6 +3411,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3409,6 +3412,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; } -@@ -3459,6 +3472,13 @@ static int packet_getsockopt(struct sock +@@ -3460,6 +3473,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; |