diff options
author | David S. Miller | 2012-07-05 12:44:25 +0200 |
---|---|---|
committer | David S. Miller | 2012-07-05 12:44:25 +0200 |
commit | c90a9bb9073a4096596360f02ea711c619663494 (patch) | |
tree | dc85d9f4c0d423e6b523e81c41a5b68e267de14f /net/core | |
parent | drivers/ieee802154/at231rf230: remove unused return status (diff) | |
parent | Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux (diff) | |
download | kernel-qcow2-linux-c90a9bb9073a4096596360f02ea711c619663494.tar.gz kernel-qcow2-linux-c90a9bb9073a4096596360f02ea711c619663494.tar.xz kernel-qcow2-linux-c90a9bb9073a4096596360f02ea711c619663494.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/core')
-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 5b21522ed0e1..5a789a807ec3 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, |