diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2005-11-20 20:52:16 -0800 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2005-11-20 20:52:16 -0800 |
commit | 1ef43204f4bd24dcd3156185b19b31b6b4151ae9 (patch) | |
tree | 812293eda94f9e14ee35c0be3d84da4b96f4972e /include/net/ipv6.h | |
parent | 5d5780df23537ad0db72267fe11103d2c23d9b2a (diff) | |
parent | df9890c31a1a447254f39e40c3fd81ad6547945b (diff) | |
download | op-kernel-dev-1ef43204f4bd24dcd3156185b19b31b6b4151ae9.zip op-kernel-dev-1ef43204f4bd24dcd3156185b19b31b6b4151ae9.tar.gz |
Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6.14+advapi-fix/
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 6addb4d..0a2ad51 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; |