diff options
| author | Herbert Xu | 2005-12-14 08:16:37 +0100 |
|---|---|---|
| committer | David S. Miller | 2006-01-03 22:10:41 +0100 |
| commit | 3305b80c214c642b89cd5c21af83bc91ec13f8bd (patch) | |
| tree | 909ed75c500d0ac422738781f84a819c933703c5 /include/linux/skbuff.h | |
| parent | [DCCP]: Introduce dccp_ipv4_af_ops (diff) | |
| download | kernel-qcow2-linux-3305b80c214c642b89cd5c21af83bc91ec13f8bd.tar.gz kernel-qcow2-linux-3305b80c214c642b89cd5c21af83bc91ec13f8bd.tar.xz kernel-qcow2-linux-3305b80c214c642b89cd5c21af83bc91ec13f8bd.zip | |
[IP]: Simplify and consolidate MSG_PEEK error handling
When a packet is obtained from skb_recv_datagram with MSG_PEEK enabled
it is left on the socket receive queue. This means that when we detect
a checksum error we have to be careful when trying to free the packet
as someone could have dequeued it in the time being.
Currently this delicate logic is duplicated three times between UDPv4,
UDPv6 and RAWv6. This patch moves them into a one place and simplifies
the code somewhat.
This is based on a suggestion by Eric Dumazet.
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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 8c5d6001a923..97f6580ce039 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1239,6 +1239,8 @@ extern int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb, int hlen, struct iovec *iov); extern void skb_free_datagram(struct sock *sk, struct sk_buff *skb); +extern void skb_kill_datagram(struct sock *sk, struct sk_buff *skb, + unsigned int flags); extern unsigned int skb_checksum(const struct sk_buff *skb, int offset, int len, unsigned int csum); extern int skb_copy_bits(const struct sk_buff *skb, int offset, |