diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-05 06:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-05 06:44:25 -0400 |
| commit | c90a9bb9073a4096596360f02ea711c619663494 (patch) | |
| tree | dc85d9f4c0d423e6b523e81c41a5b68e267de14f /net/core | |
| parent | 23c342153ef2a4ad8bd4f2d6515126449658d2b3 (diff) | |
| parent | 9e85a6f9dc231f3ed3c1dc1b12217505d970142a (diff) | |
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, | |||
| 1755 | struct splice_pipe_desc spd = { | 1755 | struct splice_pipe_desc spd = { |
| 1756 | .pages = pages, | 1756 | .pages = pages, |
| 1757 | .partial = partial, | 1757 | .partial = partial, |
| 1758 | .nr_pages_max = MAX_SKB_FRAGS, | ||
| 1758 | .flags = flags, | 1759 | .flags = flags, |
| 1759 | .ops = &sock_pipe_buf_ops, | 1760 | .ops = &sock_pipe_buf_ops, |
| 1760 | .spd_release = sock_spd_release, | 1761 | .spd_release = sock_spd_release, |