diff --git a/[refs] b/[refs] index aca0bfaab03b..4073a6819e6d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2fdf1faa8e33082d691bcba18814276f2bd5a6f0 +refs/heads/master: dab9630fb3d206f49658066a3ecf80ea120364db diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c index b7d13a4fff48..83fee37de38e 100644 --- a/trunk/net/core/skbuff.c +++ b/trunk/net/core/skbuff.c @@ -1725,7 +1725,7 @@ unsigned int skb_find_text(struct sk_buff *skb, unsigned int from, * of the skb if any page alloc fails user this procedure returns -ENOMEM */ int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb, - int getfrag(void *from, char *to, int offset, + int (*getfrag)(void *from, char *to, int offset, int len, int odd, struct sk_buff *skb), void *from, int length) {