diff options
| author | Luis Henriques <luis.henriques@canonical.com> | 2016-01-25 10:30:21 +0000 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2016-01-25 10:44:07 +0000 |
| commit | 0920a7112e0d26d234c7c6c0ad1777b914a72cda (patch) | |
| tree | b158e6082c5fb178ccf7159a4389ed13f995d282 /include/linux | |
| parent | 0f7b4f7914e450b1bcffdbd26bbf35ee304cbfea (diff) | |
Revert "[stable-only] net: add length argument to skb_copy_and_csum_datagram_iovec"
This reverts commit fa89ae5548ed282f0ceb4660b3b93e4e2ee875f3.
As reported by Michal Kubecek, the backport of commit 89c22d8c3b27
("net: Fix skb csum races when peeking") exposed an upstream bug.
It is being reverted and replaced by a better fix.
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/skbuff.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 94038f93f145..010bc80be91c 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -2525,7 +2525,7 @@ unsigned int datagram_poll(struct file *file, struct socket *sock, int skb_copy_datagram_iovec(const struct sk_buff *from, int offset, struct iovec *to, int size); int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb, int hlen, - struct iovec *iov, int len); + struct iovec *iov); int skb_copy_datagram_from_iovec(struct sk_buff *skb, int offset, const struct iovec *from, int from_offset, int len); |