diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /include/linux/icmpv6.h | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'include/linux/icmpv6.h')
| -rw-r--r-- | include/linux/icmpv6.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/icmpv6.h b/include/linux/icmpv6.h index 10d701eec484..b6a85183c333 100644 --- a/include/linux/icmpv6.h +++ b/include/linux/icmpv6.h | |||
| @@ -175,16 +175,16 @@ struct icmp6_filter { | |||
| 175 | 175 | ||
| 176 | 176 | ||
| 177 | extern void icmpv6_send(struct sk_buff *skb, | 177 | extern void icmpv6_send(struct sk_buff *skb, |
| 178 | int type, int code, | 178 | u8 type, u8 code, |
| 179 | __u32 info, | 179 | __u32 info, |
| 180 | struct net_device *dev); | 180 | struct net_device *dev); |
| 181 | 181 | ||
| 182 | extern int icmpv6_init(void); | 182 | extern int icmpv6_init(void); |
| 183 | extern int icmpv6_err_convert(int type, int code, | 183 | extern int icmpv6_err_convert(u8 type, u8 code, |
| 184 | int *err); | 184 | int *err); |
| 185 | extern void icmpv6_cleanup(void); | 185 | extern void icmpv6_cleanup(void); |
| 186 | extern void icmpv6_param_prob(struct sk_buff *skb, | 186 | extern void icmpv6_param_prob(struct sk_buff *skb, |
| 187 | int code, int pos); | 187 | u8 code, int pos); |
| 188 | 188 | ||
| 189 | struct flowi; | 189 | struct flowi; |
| 190 | struct in6_addr; | 190 | struct in6_addr; |