diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2016-01-12 20:53:04 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2016-01-12 20:53:04 +0000 |
| commit | 4ba80a0b324d4e4e57f0ee50f89f9a5affc40ce6 (patch) | |
| tree | 3f4aeaef7819851a11f87cd003d7e02fe17c9189 /target/linux/generic/patches-3.18/630-packet_socket_type.patch | |
| parent | 50ff51e118b8c1dc098fd2d26d2235bd1add458c (diff) | |
| download | master-187ad058-4ba80a0b324d4e4e57f0ee50f89f9a5affc40ce6.tar.gz master-187ad058-4ba80a0b324d4e4e57f0ee50f89f9a5affc40ce6.tar.bz2 master-187ad058-4ba80a0b324d4e4e57f0ee50f89f9a5affc40ce6.zip | |
kernel/3.18: update to version 3.18.25
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48225 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 31f4bca2a0..c3c0fe4664 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 -@@ -1516,6 +1516,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1530,6 +1530,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 -@@ -1523,6 +1524,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1537,6 +1538,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 -@@ -1535,7 +1537,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1549,7 +1551,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))) -@@ -1742,12 +1744,12 @@ static int packet_rcv(struct sk_buff *sk +@@ -1748,12 +1750,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; -@@ -1867,12 +1869,12 @@ static int tpacket_rcv(struct sk_buff *s +@@ -1873,12 +1875,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; -@@ -2807,6 +2809,7 @@ static int packet_create(struct net *net +@@ -2828,6 +2830,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; -@@ -3387,6 +3390,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3408,6 +3411,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; } -@@ -3438,6 +3451,13 @@ static int packet_getsockopt(struct sock +@@ -3459,6 +3472,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; |