diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-01 01:59:38 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-01 01:59:38 -0500 |
| commit | 6fc88198961141c2d9d34cde0855fb2e85ea3382 (patch) | |
| tree | 8b8919de6277e77763b7a584fe2b2867c96cefd0 /net/ipv4/ip_output.c | |
| parent | 5f3fdeb6242d84126e4bd45ac9e2246833fe8352 (diff) | |
| parent | 5666c0947ede0432ba5148570aa66ffb9febff5b (diff) | |
Merge branch 'master'
Diffstat (limited to 'net/ipv4/ip_output.c')
| -rw-r--r-- | net/ipv4/ip_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 11c2f68254f0..eba64e2bd397 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c | |||
| @@ -690,7 +690,7 @@ csum_page(struct page *page, int offset, int copy) | |||
| 690 | return csum; | 690 | return csum; |
| 691 | } | 691 | } |
| 692 | 692 | ||
| 693 | inline int ip_ufo_append_data(struct sock *sk, | 693 | static inline int ip_ufo_append_data(struct sock *sk, |
| 694 | int getfrag(void *from, char *to, int offset, int len, | 694 | int getfrag(void *from, char *to, int offset, int len, |
| 695 | int odd, struct sk_buff *skb), | 695 | int odd, struct sk_buff *skb), |
| 696 | void *from, int length, int hh_len, int fragheaderlen, | 696 | void *from, int length, int hh_len, int fragheaderlen, |