diff options
| author | David S. Miller <davem@davemloft.net> | 2014-12-10 13:17:23 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-10 13:17:23 -0500 |
| commit | 6e5f59aacbf9527dfe425541c78cb8c56623e7eb (patch) | |
| tree | dc5614e1546dba2bd6896d4aa21410e1d3297a09 /include/linux/tcp.h | |
| parent | 6c702fab626328c33b539b0c618a5511aed23bed (diff) | |
| parent | 218321e7a0838c2be974539f0a5341b398d4432b (diff) | |
| download | linux-6e5f59aacbf9527dfe425541c78cb8c56623e7eb.tar.gz linux-6e5f59aacbf9527dfe425541c78cb8c56623e7eb.tar.bz2 linux-6e5f59aacbf9527dfe425541c78cb8c56623e7eb.zip | |
Merge branch 'for-davem-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
More iov_iter work for the networking from Al Viro.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/tcp.h')
| -rw-r--r-- | include/linux/tcp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/tcp.h b/include/linux/tcp.h index 3fa0a9669a3a..67309ece0772 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -162,7 +162,7 @@ struct tcp_sock { struct { struct sk_buff_head prequeue; struct task_struct *task; - struct iovec *iov; + struct msghdr *msg; int memory; int len; } ucopy; |