diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2005-11-21 05:52:16 +0100 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2005-11-21 05:52:16 +0100 |
| commit | 1ef43204f4bd24dcd3156185b19b31b6b4151ae9 (patch) | |
| tree | 812293eda94f9e14ee35c0be3d84da4b96f4972e /include | |
| parent | [IPV6]: Acquire addrconf_hash_lock for read in addrconf_verify(...) (diff) | |
| parent | [IPV6]: Fix sending extension headers before and including routing header. (diff) | |
| download | linux-1ef43204f4bd24dcd3156185b19b31b6b4151ae9.tar.xz linux-1ef43204f4bd24dcd3156185b19b31b6b4151ae9.zip | |
Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6.14+advapi-fix/
Diffstat (limited to 'include')
| -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 6addb4d464d6..0a2ad51cff82 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; |