diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-03-17 03:44:08 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-17 03:44:08 -0400 |
| commit | 1d2a1959fe534279cf37aba20b08c24c20840e52 (patch) | |
| tree | 67c0b9aa7fe22a44bf0b4af88947799203eb8f67 /include/linux/icmpv6.h | |
| parent | 5a79ce76e9bb8f4b2cd8106ee36d15ee05013bcf (diff) | |
| parent | 054cfaacf88865bff1dd58d305443d5d6c068a08 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'include/linux/icmpv6.h')
| -rw-r--r-- | include/linux/icmpv6.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/icmpv6.h b/include/linux/icmpv6.h index 4c4c74ec5987..ba45e6bc0764 100644 --- a/include/linux/icmpv6.h +++ b/include/linux/icmpv6.h | |||
| @@ -183,10 +183,10 @@ extern void icmpv6_cleanup(void); | |||
| 183 | extern void icmpv6_param_prob(struct sk_buff *skb, | 183 | extern void icmpv6_param_prob(struct sk_buff *skb, |
| 184 | u8 code, int pos); | 184 | u8 code, int pos); |
| 185 | 185 | ||
| 186 | struct flowi; | 186 | struct flowi6; |
| 187 | struct in6_addr; | 187 | struct in6_addr; |
| 188 | extern void icmpv6_flow_init(struct sock *sk, | 188 | extern void icmpv6_flow_init(struct sock *sk, |
| 189 | struct flowi *fl, | 189 | struct flowi6 *fl6, |
| 190 | u8 type, | 190 | u8 type, |
| 191 | const struct in6_addr *saddr, | 191 | const struct in6_addr *saddr, |
| 192 | const struct in6_addr *daddr, | 192 | const struct in6_addr *daddr, |