diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-21 10:46:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-21 10:46:34 -0800 |
| commit | 1a324727caa26cd65a359a958c90fbd251d4aa49 (patch) | |
| tree | 543a4f413c1c99f4b5be0b3c5f3744c9e4581db9 /include/net/ipv6.h | |
| parent | db93a82fa9d8b4d6e31c227922eaae829253bb88 (diff) | |
| parent | 461ddf3b90bb149b99c3f675959c1bd6b11ed936 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/net/ipv6.h')
| -rw-r--r-- | include/net/ipv6.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 6addb4d464d..0a2ad51cff8 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -237,6 +237,8 @@ extern struct ipv6_txoptions * ipv6_renew_options(struct sock *sk, struct ipv6_t int newtype, struct ipv6_opt_hdr __user *newopt, int newoptlen); +struct ipv6_txoptions *ipv6_fixup_options(struct ipv6_txoptions *opt_space, + struct ipv6_txoptions *opt); extern int ip6_frag_nqueues; extern atomic_t ip6_frag_mem; |