diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-03-18 18:21:08 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-18 18:21:08 +0000 |
| commit | 5d4be21553ddc62ac97b9698c656829d7e814ee1 (patch) | |
| tree | 96d2c11b857e6ec2cd443a6bb5cc76239994c1f9 /target/linux/generic/patches-4.0/630-packet_socket_type.patch | |
| parent | 5abe49b74ed399880c9f16e0fac2e1a2b302f9d7 (diff) | |
| download | master-187ad058-5d4be21553ddc62ac97b9698c656829d7e814ee1.tar.gz master-187ad058-5d4be21553ddc62ac97b9698c656829d7e814ee1.tar.bz2 master-187ad058-5d4be21553ddc62ac97b9698c656829d7e814ee1.zip | |
kernel: bump to 3.14.35, 3.18.9, 3.19.1 and 4.0-rc4
also refresh generic patches for 3.14, 3.18, 3.19 and 4.0
targets might need a minor refresh as well, however, it looks
like everything still applies cleanly with occasional small
offsets.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44876 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.0/630-packet_socket_type.patch')
| -rw-r--r-- | target/linux/generic/patches-4.0/630-packet_socket_type.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/generic/patches-4.0/630-packet_socket_type.patch b/target/linux/generic/patches-4.0/630-packet_socket_type.patch index f96ee28e7b..8c5711ba7a 100644 --- a/target/linux/generic/patches-4.0/630-packet_socket_type.patch +++ b/target/linux/generic/patches-4.0/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 -@@ -1533,6 +1533,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1541,6 +1541,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 -@@ -1540,6 +1541,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1548,6 +1549,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 -@@ -1552,7 +1554,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1560,7 +1562,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))) -@@ -1759,12 +1761,12 @@ static int packet_rcv(struct sk_buff *sk +@@ -1767,12 +1769,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; -@@ -1884,12 +1886,12 @@ static int tpacket_rcv(struct sk_buff *s +@@ -1892,12 +1894,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; -@@ -2845,6 +2847,7 @@ static int packet_create(struct net *net +@@ -2853,6 +2855,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; -@@ -3428,6 +3431,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3442,6 +3445,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; } -@@ -3479,6 +3492,13 @@ static int packet_getsockopt(struct sock +@@ -3493,6 +3506,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; |