diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-02 21:38:06 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-02 21:38:06 +0300 |
| commit | da7b66ffb2815800440d9e1649282a27c805304f (patch) | |
| tree | 59e1cbab628f69afddd80e1eecaa18b2c6a02b92 /net/core | |
| parent | 5b13475a5e12c49c24422ba1bd9998521dec1d4e (diff) | |
| parent | 13c0f52beb6310b9c08804c0929901f70abd211a (diff) | |
| download | linux-da7b66ffb2815800440d9e1649282a27c805304f.tar.xz | |
Merge branch 'work.splice' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull splice updates from Al Viro:
"These actually missed the last cycle; the branch itself is from last
December"
* 'work.splice' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
make nr_pages calculation in default_file_splice_read() a bit less ugly
splice/tee/vmsplice: validate flags
splice_pipe_desc: kill ->flags
remove spd_release_page()
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/skbuff.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index f1d04592ace0..b782b4593f8c 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -1982,7 +1982,6 @@ int skb_splice_bits(struct sk_buff *skb, struct sock *sk, unsigned int offset, .pages = pages, .partial = partial, .nr_pages_max = MAX_SKB_FRAGS, - .flags = flags, .ops = &nosteal_pipe_buf_ops, .spd_release = sock_spd_release, }; |