projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ar71xx: add kmod-ledtrig-usbdev for the MZK-W04NU profile as well
[openwrt.git]
/
target
/
linux
/
generic
/
patches-2.6.35
/
240-packet_socket_type.patch
diff --git
a/target/linux/generic/patches-2.6.35/240-packet_socket_type.patch
b/target/linux/generic/patches-2.6.35/240-packet_socket_type.patch
index
afaf920
..
4411765
100644
(file)
--- a/
target/linux/generic/patches-2.6.35/240-packet_socket_type.patch
+++ b/
target/linux/generic/patches-2.6.35/240-packet_socket_type.patch
@@
-26,15
+26,15
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
unsigned int tp_packets;
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
unsigned int tp_packets;
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
-@@ -20
2,6 +202
,7 @@ struct packet_sock {
+@@ -20
3,6 +203
,7 @@ struct packet_sock {
unsigned int tp_reserve;
unsigned int tp_loss:1;
struct packet_type prot_hook ____cacheline_aligned_in_smp;
unsigned int tp_reserve;
unsigned int tp_loss:1;
struct packet_type prot_hook ____cacheline_aligned_in_smp;
-+
__u8 pkt_type:3
;
++
unsigned int pkt_type
;
};
struct packet_skb_cb {
};
struct packet_skb_cb {
-@@ -33
6,6 +337
,7 @@ static int packet_rcv_spkt(struct sk_buf
+@@ -33
9,6 +340
,7 @@ static int packet_rcv_spkt(struct sk_buf
{
struct sock *sk;
struct sockaddr_pkt *spkt;
{
struct sock *sk;
struct sockaddr_pkt *spkt;
@@
-42,7
+42,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
-@@ -34
3,6 +345
,7 @@ static int packet_rcv_spkt(struct sk_buf
+@@ -34
6,6 +348
,7 @@ static int packet_rcv_spkt(struct sk_buf
*/
sk = pt->af_packet_priv;
*/
sk = pt->af_packet_priv;
@@
-50,7
+50,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
-@@ -35
5,7 +358
,7 @@ static int packet_rcv_spkt(struct sk_buf
+@@ -35
8,7 +361
,7 @@ static int packet_rcv_spkt(struct sk_buf
* so that this procedure is noop.
*/
* so that this procedure is noop.
*/
@@
-59,7
+59,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)))
-@@ -53
1,12 +534
,12 @@ static int packet_rcv(struct sk_buff *sk
+@@ -53
7,12 +540
,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;
@@
-75,7
+75,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;
-@@ -65
1,12 +654
,12 @@ static int tpacket_rcv(struct sk_buff *s
+@@ -65
7,12 +660
,12 @@ static int tpacket_rcv(struct sk_buff *s
struct timeval tv;
struct timespec ts;
struct timeval tv;
struct timespec ts;
@@
-91,7
+91,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;
-@@ -14
64,6 +1467
,7 @@ static int packet_create(struct net *net
+@@ -14
73,6 +1476
,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;
@@
-99,7
+99,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;
-@@ -
1968,6 +1972
,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -
2027,6 +2031
,16 @@ packet_setsockopt(struct socket *sock, i
po->has_vnet_hdr = !!val;
return 0;
}
po->has_vnet_hdr = !!val;
return 0;
}
@@
-116,7
+116,7
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
default:
return -ENOPROTOOPT;
}
default:
return -ENOPROTOOPT;
}
-@@ -20
25,6 +2039
,13 @@ static int packet_getsockopt(struct sock
+@@ -20
84,6 +2098
,13 @@ static int packet_getsockopt(struct sock
data = &val;
break;
data = &val;
break;
This page took
0.024446 seconds
and
4
git commands to generate.