From 2af4cb6cc493d29f6311ac53dd7a7aa46634735c Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Wed, 16 Jul 2008 20:12:30 -0700 Subject: [PATCH] --- yaml --- r: 103556 b: refs/heads/master c: 7b1c65faa27f5ade3915e4bbc9186b6e64d2d6ec h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/skbuff.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fb8b5bbeaa12..d1fb8a36efc7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 885a4c966bcc11a1470c2b85a90360f6518a507a +refs/heads/master: 7b1c65faa27f5ade3915e4bbc9186b6e64d2d6ec diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c index 48a43727d12f..e4115672b6cf 100644 --- a/trunk/net/core/skbuff.c +++ b/trunk/net/core/skbuff.c @@ -1332,7 +1332,7 @@ static inline int __splice_segment(struct page *page, unsigned int poff, * Map linear and fragment data from the skb to spd. It reports failure if the * pipe is full or if we already spliced the requested length. */ -int __skb_splice_bits(struct sk_buff *skb, unsigned int *offset, +static int __skb_splice_bits(struct sk_buff *skb, unsigned int *offset, unsigned int *len, struct splice_pipe_desc *spd) {