projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 4.4 to 4.4.102
[openwrt/openwrt.git]
/
target
/
linux
/
generic
/
patches-4.4
/
630-packet_socket_type.patch
diff --git
a/target/linux/generic/patches-4.4/630-packet_socket_type.patch
b/target/linux/generic/patches-4.4/630-packet_socket_type.patch
index 8c6b7a37b575ab6811525a15ccb590b328af35fb..a427165f410272055b43a46fc6c9b5f448c0b304 100644
(file)
--- a/
target/linux/generic/patches-4.4/630-packet_socket_type.patch
+++ b/
target/linux/generic/patches-4.4/630-packet_socket_type.patch
@@
-26,7
+26,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
#define PACKET_FANOUT_LB 1
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
#define PACKET_FANOUT_LB 1
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
-@@ -17
76,6 +1776
,7 @@ static int packet_rcv_spkt(struct sk_buf
+@@ -17
84,6 +1784
,7 @@ static int packet_rcv_spkt(struct sk_buf
{
struct sock *sk;
struct sockaddr_pkt *spkt;
{
struct sock *sk;
struct sockaddr_pkt *spkt;
@@
-34,7
+34,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
/*
* When we registered the protocol we saved the socket in the data
/*
* When we registered the protocol we saved the socket in the data
-@@ -17
83,6 +1784
,7 @@ static int packet_rcv_spkt(struct sk_buf
+@@ -17
91,6 +1792
,7 @@ static int packet_rcv_spkt(struct sk_buf
*/
sk = pt->af_packet_priv;
*/
sk = pt->af_packet_priv;
@@
-42,7
+42,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
/*
* Yank back the headers [hope the device set this
/*
* Yank back the headers [hope the device set this
-@@ -1
795,7 +1797
,7 @@ static int packet_rcv_spkt(struct sk_buf
+@@ -1
803,7 +1805
,7 @@ static int packet_rcv_spkt(struct sk_buf
* so that this procedure is noop.
*/
* so that this procedure is noop.
*/
@@
-51,7
+51,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
goto out;
if (!net_eq(dev_net(dev), sock_net(sk)))
goto out;
if (!net_eq(dev_net(dev), sock_net(sk)))
-@@ -
1998,12 +2000
,12 @@ static int packet_rcv(struct sk_buff *sk
+@@ -
2006,12 +2008
,12 @@ static int packet_rcv(struct sk_buff *sk
int skb_len = skb->len;
unsigned int snaplen, res;
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;
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
-@@ -21
23,12 +2125
,12 @@ static int tpacket_rcv(struct sk_buff *s
+@@ -21
31,12 +2133
,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);
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;
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
-@@ -31
15,6 +3117
,7 @@ static int packet_create(struct net *net
+@@ -31
27,6 +3129
,7 @@ static int packet_create(struct net *net
mutex_init(&po->pg_vec_lock);
po->rollover = NULL;
po->prot_hook.func = packet_rcv;
mutex_init(&po->pg_vec_lock);
po->rollover = NULL;
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;
if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt;
-@@ -37
44,6 +3747
,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -37
56,6 +3759
,16 @@ packet_setsockopt(struct socket *sock, i
po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
return 0;
}
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;
}
default:
return -ENOPROTOOPT;
}
-@@ -3
796,6 +3809
,13 @@ static int packet_getsockopt(struct sock
+@@ -3
809,6 +3822
,13 @@ static int packet_getsockopt(struct sock
case PACKET_VNET_HDR:
val = po->has_vnet_hdr;
break;
case PACKET_VNET_HDR:
val = po->has_vnet_hdr;
break;