diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2011-01-21 17:52:22 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2011-01-21 17:52:22 +0000 |
commit | 2a7bdb2ef04b744e08d54e65e2cd76780a71aa34 (patch) | |
tree | 7b8643b5144db15c53536abf69dec2a49aa31bef /target/linux/generic/patches-2.6.38/240-packet_socket_type.patch | |
parent | 318102d24a60f6442052508c391aa984c5dbf97c (diff) | |
download | master-187ad058-2a7bdb2ef04b744e08d54e65e2cd76780a71aa34.tar.gz master-187ad058-2a7bdb2ef04b744e08d54e65e2cd76780a71aa34.tar.bz2 master-187ad058-2a7bdb2ef04b744e08d54e65e2cd76780a71aa34.zip |
[target/generic]: preliminary 2.6.38 support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25057 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.38/240-packet_socket_type.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.38/240-packet_socket_type.patch | 132 |
1 files changed, 132 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.38/240-packet_socket_type.patch b/target/linux/generic/patches-2.6.38/240-packet_socket_type.patch new file mode 100644 index 0000000000..a8ad9171ec --- /dev/null +++ b/target/linux/generic/patches-2.6.38/240-packet_socket_type.patch @@ -0,0 +1,132 @@ +This patch allows the user to specify desired packet types (outgoing, +broadcast, unicast, etc.) on packet sockets via setsockopt. +This can reduce the load in situations where only a limited number +of packet types are necessary + +Signed-off-by: Felix Fietkau <nbd@openwrt.org> + +--- a/include/linux/if_packet.h ++++ b/include/linux/if_packet.h +@@ -29,6 +29,8 @@ struct sockaddr_ll { + /* These ones are invisible by user level */ + #define PACKET_LOOPBACK 5 /* MC/BRD frame looped back */ + #define PACKET_FASTROUTE 6 /* Fastrouted frame */ ++#define PACKET_MASK_ANY 0xffffffff /* mask for packet type bits */ ++ + + /* Packet socket options */ + +@@ -49,6 +51,7 @@ struct sockaddr_ll { + #define PACKET_VNET_HDR 15 + #define PACKET_TX_TIMESTAMP 16 + #define PACKET_TIMESTAMP 17 ++#define PACKET_RECV_TYPE 18 + + struct tpacket_stats { + unsigned int tp_packets; +--- a/net/packet/af_packet.c ++++ b/net/packet/af_packet.c +@@ -211,6 +211,7 @@ struct packet_sock { + unsigned int tp_loss:1; + unsigned int tp_tstamp; + struct packet_type prot_hook ____cacheline_aligned_in_smp; ++ unsigned int pkt_type; + }; + + struct packet_skb_cb { +@@ -355,6 +356,7 @@ static int packet_rcv_spkt(struct sk_buf + { + struct sock *sk; + struct sockaddr_pkt *spkt; ++ struct packet_sock *po; + + /* + * When we registered the protocol we saved the socket in the data +@@ -362,6 +364,7 @@ static int packet_rcv_spkt(struct sk_buf + */ + + sk = pt->af_packet_priv; ++ po = pkt_sk(sk); + + /* + * Yank back the headers [hope the device set this +@@ -374,7 +377,7 @@ static int packet_rcv_spkt(struct sk_buf + * so that this procedure is noop. + */ + +- if (skb->pkt_type == PACKET_LOOPBACK) ++ if (!(po->pkt_type & (1 << skb->pkt_type))) + goto out; + + if (!net_eq(dev_net(dev), sock_net(sk))) +@@ -554,12 +557,12 @@ static int packet_rcv(struct sk_buff *sk + int skb_len = skb->len; + unsigned int snaplen, res; + +- if (skb->pkt_type == PACKET_LOOPBACK) +- goto drop; +- + sk = pt->af_packet_priv; + po = pkt_sk(sk); + ++ if (!(po->pkt_type & (1 << skb->pkt_type))) ++ goto drop; ++ + if (!net_eq(dev_net(dev), sock_net(sk))) + goto drop; + +@@ -675,12 +678,12 @@ static int tpacket_rcv(struct sk_buff *s + struct timespec ts; + struct skb_shared_hwtstamps *shhwtstamps = skb_hwtstamps(skb); + +- if (skb->pkt_type == PACKET_LOOPBACK) +- goto drop; +- + sk = pt->af_packet_priv; + po = pkt_sk(sk); + ++ if (!(po->pkt_type & (1 << skb->pkt_type))) ++ goto drop; ++ + if (!net_eq(dev_net(dev), sock_net(sk))) + goto drop; + +@@ -1500,6 +1503,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; ++ po->pkt_type = PACKET_MASK_ANY & ~(1 << PACKET_LOOPBACK); + + if (sock->type == SOCK_PACKET) + po->prot_hook.func = packet_rcv_spkt; +@@ -2068,6 +2072,16 @@ packet_setsockopt(struct socket *sock, i + po->tp_tstamp = val; + return 0; + } ++ case PACKET_RECV_TYPE: ++ { ++ unsigned int val; ++ if (optlen != sizeof(val)) ++ return -EINVAL; ++ if (copy_from_user(&val, optval, sizeof(val))) ++ return -EFAULT; ++ po->pkt_type = val & ~PACKET_LOOPBACK; ++ return 0; ++ } + default: + return -ENOPROTOOPT; + } +@@ -2125,6 +2139,13 @@ static int packet_getsockopt(struct sock + + data = &val; + break; ++ case PACKET_RECV_TYPE: ++ if (len > sizeof(unsigned int)) ++ len = sizeof(unsigned int); ++ val = po->pkt_type; ++ ++ data = &val; ++ break; + case PACKET_VERSION: + if (len > sizeof(int)) + len = sizeof(int); |