diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-07-11 19:58:44 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-07-11 19:58:44 +0000 |
commit | 58b66cdd75bc9b24acddcbccb46e8bfed4426c96 (patch) | |
tree | e4bf2c21711f0175e4d1e74ade4f7cd8319f7d1f /target/linux/generic/patches-3.18/630-packet_socket_type.patch | |
parent | 05ae45ac6fa2b8a090b2854ba72ef490bf2584ff (diff) | |
download | master-31e0f0ae-58b66cdd75bc9b24acddcbccb46e8bfed4426c96.tar.gz master-31e0f0ae-58b66cdd75bc9b24acddcbccb46e8bfed4426c96.tar.bz2 master-31e0f0ae-58b66cdd75bc9b24acddcbccb46e8bfed4426c96.zip |
kernel: update 3.18 to 3.18.18
Changelog:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.18
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 46299
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 | 16 |
1 files changed, 8 insertions, 8 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 06bd167abf..fa057b264d 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 @@ -26,7 +26,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> #define PACKET_FANOUT_LB 1 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c -@@ -1530,6 +1530,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1516,6 +1516,7 @@ static int packet_rcv_spkt(struct sk_buf { struct sock *sk; struct sockaddr_pkt *spkt; @@ -34,7 +34,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> /* * When we registered the protocol we saved the socket in the data -@@ -1537,6 +1538,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1523,6 +1524,7 @@ static int packet_rcv_spkt(struct sk_buf */ sk = pt->af_packet_priv; @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> /* * Yank back the headers [hope the device set this -@@ -1549,7 +1551,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1535,7 +1537,7 @@ static int packet_rcv_spkt(struct sk_buf * so that this procedure is noop. */ @@ -51,7 +51,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> goto out; if (!net_eq(dev_net(dev), sock_net(sk))) -@@ -1756,12 +1758,12 @@ static int packet_rcv(struct sk_buff *sk +@@ -1742,12 +1744,12 @@ static int packet_rcv(struct sk_buff *sk int skb_len = skb->len; unsigned int snaplen, res; @@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -1881,12 +1883,12 @@ static int tpacket_rcv(struct sk_buff *s +@@ -1867,12 +1869,12 @@ static int tpacket_rcv(struct sk_buff *s BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32); BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48); @@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -2823,6 +2825,7 @@ static int packet_create(struct net *net +@@ -2809,6 +2811,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; -@@ -3403,6 +3406,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3389,6 +3392,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; } -@@ -3454,6 +3467,13 @@ static int packet_getsockopt(struct sock +@@ -3440,6 +3453,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; |