diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-01 01:58:36 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-01 01:58:36 -0500 |
| commit | 6946d28a9f47f50fe3dd916e8b4229de9769108e (patch) | |
| tree | eaa7499bf7fd367cbacf777d8eec8ed038ef287d /net/ipv6/ip6_output.c | |
| parent | 6c9e5eb522bca694a0311898039d2707e9bc7783 (diff) | |
| parent | 5666c0947ede0432ba5148570aa66ffb9febff5b (diff) | |
| download | linux-next-6946d28a9f47f50fe3dd916e8b4229de9769108e.tar.gz | |
Merge branch 'master'
Diffstat (limited to 'net/ipv6/ip6_output.c')
| -rw-r--r-- | net/ipv6/ip6_output.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index c1fa693511a1..8523c76ebf76 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -774,7 +774,8 @@ out_err_release: *dst = NULL; return err; } -inline int ip6_ufo_append_data(struct sock *sk, + +static inline int ip6_ufo_append_data(struct sock *sk, int getfrag(void *from, char *to, int offset, int len, int odd, struct sk_buff *skb), void *from, int length, int hh_len, int fragheaderlen, |