diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 03:50:33 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 03:50:33 -0500 |
| commit | 2226340eb8df9c42f9fca74582d08d5117fc0cec (patch) | |
| tree | c98370844715194600b79f886dbc391633f3e470 /include/net/ipv6.h | |
| parent | 2e06cb5859fdaeba0529806eb1bf161ffd0db201 (diff) | |
| parent | 624f54be206adf970cd8eece16446b027913e533 (diff) | |
Merge branch 'master'
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 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; |