projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
upgrade 3.12 targets to 3.12.5
[openwrt.git]
/
target
/
linux
/
generic
/
patches-3.12
/
630-packet_socket_type.patch
diff --git
a/target/linux/generic/patches-3.12/630-packet_socket_type.patch
b/target/linux/generic/patches-3.12/630-packet_socket_type.patch
index
210b18e
..
d1b0fe1
100644
(file)
--- a/
target/linux/generic/patches-3.12/630-packet_socket_type.patch
+++ b/
target/linux/generic/patches-3.12/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
#define PACKET_FANOUT_LB 1
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
-@@ -13
86,6 +1386
,7 @@ static int packet_rcv_spkt(struct sk_buf
+@@ -13
93,6 +1393
,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@openwrt.org>
/*
* When we registered the protocol we saved the socket in the data
/*
* When we registered the protocol we saved the socket in the data
-@@ -1
393,6 +1394
,7 @@ static int packet_rcv_spkt(struct sk_buf
+@@ -1
400,6 +1401
,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@openwrt.org>
/*
* Yank back the headers [hope the device set this
/*
* Yank back the headers [hope the device set this
-@@ -14
05,7 +1407
,7 @@ static int packet_rcv_spkt(struct sk_buf
+@@ -14
12,7 +1414
,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@openwrt.org>
goto out;
if (!net_eq(dev_net(dev), sock_net(sk)))
goto out;
if (!net_eq(dev_net(dev), sock_net(sk)))
-@@ -161
2,12 +1614
,12 @@ static int packet_rcv(struct sk_buff *sk
+@@ -161
9,12 +1621
,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@openwrt.org>
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
-@@ -173
0,12 +1732
,12 @@ static int tpacket_rcv(struct sk_buff *s
+@@ -173
7,12 +1739
,12 @@ static int tpacket_rcv(struct sk_buff *s
struct timespec ts;
__u32 ts_status;
struct timespec ts;
__u32 ts_status;
@@
-83,7
+83,7
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
-@@ -26
25,6 +2627
,7 @@ static int packet_create(struct net *net
+@@ -26
38,6 +2640
,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;
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;
if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt;
-@@ -3
193,6 +3196
,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -3
204,6 +3207
,16 @@ packet_setsockopt(struct socket *sock, i
po->tp_tx_has_off = !!val;
return 0;
}
po->tp_tx_has_off = !!val;
return 0;
}
@@
-108,7
+108,7
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
default:
return -ENOPROTOOPT;
}
default:
return -ENOPROTOOPT;
}
-@@ -32
44,6 +3257
,13 @@ static int packet_getsockopt(struct sock
+@@ -32
55,6 +3268
,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;
@@
-124,9
+124,9
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
break;
--- a/net/packet/internal.h
+++ b/net/packet/internal.h
break;
--- a/net/packet/internal.h
+++ b/net/packet/internal.h
-@@ -114,6 +114,7 @@ struct packet_sock {
- unsigned int tp_tx_has_off:1;
+@@ -115,6 +115,7 @@ struct packet_sock {
unsigned int tp_tstamp;
unsigned int tp_tstamp;
+ struct net_device __rcu *cached_dev;
struct packet_type prot_hook ____cacheline_aligned_in_smp;
+ unsigned int pkt_type;
};
struct packet_type prot_hook ____cacheline_aligned_in_smp;
+ unsigned int pkt_type;
};