diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2010-02-13 00:37:11 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-02-13 00:37:11 +0000 |
commit | e268649a976d3f690ec231b046ec329a1ba69377 (patch) | |
tree | db07353134da31eadcf10d01b1dee4681a45ba0b /target/linux/generic-2.6/patches-2.6.32/240-packet_socket_type.patch | |
parent | a2431086551566a41227ecf4194cd9606b909ac9 (diff) | |
download | upstream-e268649a976d3f690ec231b046ec329a1ba69377.tar.gz upstream-e268649a976d3f690ec231b046ec329a1ba69377.tar.bz2 upstream-e268649a976d3f690ec231b046ec329a1ba69377.zip |
prepare kernel 2.6.32 support
SVN-Revision: 19617
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.32/240-packet_socket_type.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.32/240-packet_socket_type.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.32/240-packet_socket_type.patch b/target/linux/generic-2.6/patches-2.6.32/240-packet_socket_type.patch index 71827643e6..a03d699575 100644 --- a/target/linux/generic-2.6/patches-2.6.32/240-packet_socket_type.patch +++ b/target/linux/generic-2.6/patches-2.6.32/240-packet_socket_type.patch @@ -7,7 +7,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> --- a/include/linux/if_packet.h +++ b/include/linux/if_packet.h -@@ -31,6 +31,8 @@ struct sockaddr_ll +@@ -31,6 +31,8 @@ /* These ones are invisible by user level */ #define PACKET_LOOPBACK 5 /* MC/BRD frame looped back */ #define PACKET_FASTROUTE 6 /* Fastrouted frame */ @@ -16,7 +16,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> /* Packet socket options */ -@@ -48,6 +50,7 @@ struct sockaddr_ll +@@ -48,6 +50,7 @@ #define PACKET_RESERVE 12 #define PACKET_TX_RING 13 #define PACKET_LOSS 14 @@ -26,7 +26,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> { --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c -@@ -204,6 +204,7 @@ struct packet_sock { +@@ -204,6 +204,7 @@ unsigned int tp_reserve; unsigned int tp_loss:1; #endif @@ -34,7 +34,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> }; struct packet_skb_cb { -@@ -342,6 +343,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -342,6 +343,7 @@ { 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 -@@ -349,6 +351,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -349,6 +351,7 @@ */ 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 -@@ -361,7 +364,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -361,7 +364,7 @@ * so that this procedure is noop. */ @@ -59,7 +59,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> goto out; if (dev_net(dev) != sock_net(sk)) -@@ -545,12 +548,12 @@ static int packet_rcv(struct sk_buff *sk +@@ -545,12 +548,12 @@ int skb_len = skb->len; unsigned int snaplen, res; @@ -75,7 +75,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> if (dev_net(dev) != sock_net(sk)) goto drop; -@@ -667,12 +670,12 @@ static int tpacket_rcv(struct sk_buff *s +@@ -667,12 +670,12 @@ struct timeval tv; struct timespec ts; @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> if (dev_net(dev) != sock_net(sk)) goto drop; -@@ -1381,6 +1384,7 @@ static int packet_create(struct net *net +@@ -1390,6 +1393,7 @@ 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; -@@ -1728,6 +1732,16 @@ packet_setsockopt(struct socket *sock, i +@@ -1737,6 +1741,16 @@ ret = packet_mc_drop(sk, &mreq); return ret; } @@ -116,7 +116,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> #ifdef CONFIG_PACKET_MMAP case PACKET_RX_RING: -@@ -1873,6 +1887,13 @@ static int packet_getsockopt(struct sock +@@ -1882,6 +1896,13 @@ data = &val; break; |