diff options
| author | Mark Brown <[email protected]> | 2012-07-22 18:32:00 +0000 |
|---|---|---|
| committer | Mark Brown <[email protected]> | 2012-07-22 18:32:00 +0000 |
| commit | 3384fb98845dc014770caa224d61a2effd258ca5 (patch) | |
| tree | 8189134a4938632e2d06e93af04c9fc1f3c2d4c9 /net/core/skbuff.c | |
| parent | Merge branches 'regulator-core', 'regulator-dt' and 'regulator-dummy' into re... (diff) | |
| parent | regulator: add new lp8788 regulator driver (diff) | |
| download | kernel-3384fb98845dc014770caa224d61a2effd258ca5.tar.gz kernel-3384fb98845dc014770caa224d61a2effd258ca5.zip | |
Merge branch 'regulator-drivers' into regulator-next
Diffstat (limited to 'net/core/skbuff.c')
| -rw-r--r-- | net/core/skbuff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index d78671e9d545..46a3d23d259e 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -1755,6 +1755,7 @@ int skb_splice_bits(struct sk_buff *skb, unsigned int offset, struct splice_pipe_desc spd = { .pages = pages, .partial = partial, + .nr_pages_max = MAX_SKB_FRAGS, .flags = flags, .ops = &sock_pipe_buf_ops, .spd_release = sock_spd_release, |