diff options
| author | Herbert Xu | 2007-12-05 10:53:40 +0100 |
|---|---|---|
| committer | David S. Miller | 2008-01-28 23:56:34 +0100 |
| commit | a59322be07c964e916d15be3df473fb7ba20c41e (patch) | |
| tree | 16d4caa41c1fd6c3fb907ce792202b157e6c9a1e /include/linux/skbuff.h | |
| parent | [UDP]: Restore missing inDatagrams increments (diff) | |
| download | kernel-qcow2-linux-a59322be07c964e916d15be3df473fb7ba20c41e.tar.gz kernel-qcow2-linux-a59322be07c964e916d15be3df473fb7ba20c41e.tar.xz kernel-qcow2-linux-a59322be07c964e916d15be3df473fb7ba20c41e.zip | |
[UDP]: Only increment counter on first peek/recv
The previous move of the the UDP inDatagrams counter caused each
peek of the same packet to be counted separately. This may be
undesirable.
This patch fixes this by adding a bit to sk_buff to record whether
this packet has already been seen through skb_recv_datagram. We
then only increment the counter when the packet is seen for the
first time.
The only dodgy part is the fact that skb_recv_datagram doesn't have
a good way of returning this new bit of information. So I've added
a new function __skb_recv_datagram that does return this and made
skb_recv_datagram a wrapper around it.
The plan is to eventually replace all uses of skb_recv_datagram with
this new function at which time it can be renamed its proper name.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/skbuff.h')
| -rw-r--r-- | include/linux/skbuff.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 17b3f70fbbc3..c618fbf7d173 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -288,6 +288,7 @@ struct sk_buff { __u8 pkt_type:3, fclone:2, ipvs_property:1, + peeked:1, nf_trace:1; __be16 protocol; @@ -1538,6 +1539,8 @@ static inline int pskb_trim_rcsum(struct sk_buff *skb, unsigned int len) skb = skb->prev) +extern struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned flags, + int *peeked, int *err); extern struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock, int *err); extern unsigned int datagram_poll(struct file *file, struct socket *sock, |