diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:55:53 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:55:53 -0400 |
| commit | 7894eaf291238a62a565e9e9777483beeb00eeae (patch) | |
| tree | 43c08830d2030d39d719f3f3d54a0e9b36554770 /include/net/ipv6.h | |
| parent | 9e73972cef1c0961c78b0e0b61c4ecc275b29f04 (diff) | |
| parent | acc696d93dcf993dec123d69d599979e1456ffec (diff) | |
Merge branch 'upstream' into irq-pio
Diffstat (limited to 'include/net/ipv6.h')
| -rw-r--r-- | include/net/ipv6.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 6d6f0634ae41..4abedb8eaece 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h | |||
| @@ -230,7 +230,7 @@ extern int ip6_ra_control(struct sock *sk, int sel, | |||
| 230 | void (*destructor)(struct sock *)); | 230 | void (*destructor)(struct sock *)); |
| 231 | 231 | ||
| 232 | 232 | ||
| 233 | extern int ipv6_parse_hopopts(struct sk_buff *skb, int); | 233 | extern int ipv6_parse_hopopts(struct sk_buff *skb); |
| 234 | 234 | ||
| 235 | extern struct ipv6_txoptions * ipv6_dup_options(struct sock *sk, struct ipv6_txoptions *opt); | 235 | extern struct ipv6_txoptions * ipv6_dup_options(struct sock *sk, struct ipv6_txoptions *opt); |
| 236 | extern struct ipv6_txoptions * ipv6_renew_options(struct sock *sk, struct ipv6_txoptions *opt, | 236 | extern struct ipv6_txoptions * ipv6_renew_options(struct sock *sk, struct ipv6_txoptions *opt, |