diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2005-11-20 23:52:16 -0500 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2005-11-20 23:52:16 -0500 |
| commit | 1ef43204f4bd24dcd3156185b19b31b6b4151ae9 (patch) | |
| tree | 812293eda94f9e14ee35c0be3d84da4b96f4972e /include | |
| parent | 5d5780df23537ad0db72267fe11103d2c23d9b2a (diff) | |
| parent | df9890c31a1a447254f39e40c3fd81ad6547945b (diff) | |
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 | |||
| 237 | int newtype, | 237 | int newtype, |
| 238 | struct ipv6_opt_hdr __user *newopt, | 238 | struct ipv6_opt_hdr __user *newopt, |
| 239 | int newoptlen); | 239 | int newoptlen); |
| 240 | struct ipv6_txoptions *ipv6_fixup_options(struct ipv6_txoptions *opt_space, | ||
| 241 | struct ipv6_txoptions *opt); | ||
| 240 | 242 | ||
| 241 | extern int ip6_frag_nqueues; | 243 | extern int ip6_frag_nqueues; |
| 242 | extern atomic_t ip6_frag_mem; | 244 | extern atomic_t ip6_frag_mem; |