diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 01:46:20 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 01:46:20 -0500 |
| commit | 80c7af4074cbb4cb6be5d35c443ea6d5e8838a84 (patch) | |
| tree | e900ad4c0beb4f44f0912b847c3319f11ef57d73 /net/core/skbuff.c | |
| parent | 451ec6ab310602515b361418debe93d00f67e273 (diff) | |
| parent | d00d598ffbba974d9045ba8b95296655fe2162c5 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'net/core/skbuff.c')
| -rw-r--r-- | net/core/skbuff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index b7d13a4fff4..83fee37de38 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
| @@ -1725,7 +1725,7 @@ unsigned int skb_find_text(struct sk_buff *skb, unsigned int from, | |||
| 1725 | * of the skb if any page alloc fails user this procedure returns -ENOMEM | 1725 | * of the skb if any page alloc fails user this procedure returns -ENOMEM |
| 1726 | */ | 1726 | */ |
| 1727 | int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb, | 1727 | int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb, |
| 1728 | int getfrag(void *from, char *to, int offset, | 1728 | int (*getfrag)(void *from, char *to, int offset, |
| 1729 | int len, int odd, struct sk_buff *skb), | 1729 | int len, int odd, struct sk_buff *skb), |
| 1730 | void *from, int length) | 1730 | void *from, int length) |
| 1731 | { | 1731 | { |