diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /include/linux/icmpv6.h | |
parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
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, |