diff options
| author | Zoltan HERPAI <wigyori@uid0.hu> | 2016-10-12 00:15:28 +0200 |
|---|---|---|
| committer | Zoltan HERPAI <wigyori@uid0.hu> | 2016-10-12 00:15:28 +0200 |
| commit | a7099373073304de9c0b6aa6d0909b4d079ebe2f (patch) | |
| tree | ec112cdb04541c437183cade6d4cd95e6286e9e9 /target/linux/generic/patches-4.1/630-packet_socket_type.patch | |
| parent | 4acd4da998e71c681f7030f9706abda055f95ccc (diff) | |
| download | master-187ad058-a7099373073304de9c0b6aa6d0909b4d079ebe2f.tar.gz master-187ad058-a7099373073304de9c0b6aa6d0909b4d079ebe2f.tar.bz2 master-187ad058-a7099373073304de9c0b6aa6d0909b4d079ebe2f.zip | |
Revert "kernel: bump 4.1 to 4.1.30"
Stay on 4.1.27
This reverts commit 231ef70f455fcc230a400af90a13e181a2c261cd.
Diffstat (limited to 'target/linux/generic/patches-4.1/630-packet_socket_type.patch')
| -rw-r--r-- | target/linux/generic/patches-4.1/630-packet_socket_type.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-4.1/630-packet_socket_type.patch b/target/linux/generic/patches-4.1/630-packet_socket_type.patch index a59cba33d6..a52c45413e 100644 --- a/target/linux/generic/patches-4.1/630-packet_socket_type.patch +++ b/target/linux/generic/patches-4.1/630-packet_socket_type.patch @@ -51,7 +51,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> goto out; if (!net_eq(dev_net(dev), sock_net(sk))) -@@ -1769,12 +1771,12 @@ static int packet_rcv(struct sk_buff *sk +@@ -1765,12 +1767,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@nbd.name> if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -1894,12 +1896,12 @@ static int tpacket_rcv(struct sk_buff *s +@@ -1890,12 +1892,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@nbd.name> if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -2866,6 +2868,7 @@ static int packet_create(struct net *net +@@ -2871,6 +2873,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@nbd.name> if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3472,6 +3475,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3476,6 +3479,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; } -@@ -3523,6 +3536,13 @@ static int packet_getsockopt(struct sock +@@ -3527,6 +3540,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; |