diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-01 13:45:57 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-01 13:45:57 +0000 |
| commit | 55a912f43e9762638e3b3d0fc640d903f29ba8b7 (patch) | |
| tree | 80f32338e0470a97524f0617bf835586004d810c /target/linux/generic/patches-3.18/630-packet_socket_type.patch | |
| parent | 9130e4dc3267e4d1f25e22cddf798991bc6197cf (diff) | |
| download | upstream-55a912f43e9762638e3b3d0fc640d903f29ba8b7.tar.gz upstream-55a912f43e9762638e3b3d0fc640d903f29ba8b7.tar.bz2 upstream-55a912f43e9762638e3b3d0fc640d903f29ba8b7.zip | |
kernel: update kernel 3.18 to version 3.18.23
Changelog:
* https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.22
* https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.23
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 47334
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 | 6 |
1 files changed, 3 insertions, 3 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 fa057b264d..31f4bca2a0 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 @@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -2809,6 +2811,7 @@ static int packet_create(struct net *net +@@ -2807,6 +2809,7 @@ static int packet_create(struct net *net spin_lock_init(&po->bind_lock); mutex_init(&po->pg_vec_lock); po->prot_hook.func = packet_rcv; @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3389,6 +3392,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3387,6 +3390,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@openwrt.org> default: return -ENOPROTOOPT; } -@@ -3440,6 +3453,13 @@ static int packet_getsockopt(struct sock +@@ -3438,6 +3451,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; |