diff options
Diffstat (limited to 'include/net/ipv6.h')
| -rw-r--r-- | include/net/ipv6.h | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 96e50e0ce3ca..34200f9e6805 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h | |||
| @@ -492,7 +492,7 @@ extern int ip6_rcv_finish(struct sk_buff *skb); | |||
| 492 | */ | 492 | */ |
| 493 | extern int ip6_xmit(struct sock *sk, | 493 | extern int ip6_xmit(struct sock *sk, |
| 494 | struct sk_buff *skb, | 494 | struct sk_buff *skb, |
| 495 | struct flowi *fl, | 495 | struct flowi6 *fl6, |
| 496 | struct ipv6_txoptions *opt); | 496 | struct ipv6_txoptions *opt); |
| 497 | 497 | ||
| 498 | extern int ip6_nd_hdr(struct sock *sk, | 498 | extern int ip6_nd_hdr(struct sock *sk, |
| @@ -512,7 +512,7 @@ extern int ip6_append_data(struct sock *sk, | |||
| 512 | int hlimit, | 512 | int hlimit, |
| 513 | int tclass, | 513 | int tclass, |
| 514 | struct ipv6_txoptions *opt, | 514 | struct ipv6_txoptions *opt, |
| 515 | struct flowi *fl, | 515 | struct flowi6 *fl6, |
| 516 | struct rt6_info *rt, | 516 | struct rt6_info *rt, |
| 517 | unsigned int flags, | 517 | unsigned int flags, |
| 518 | int dontfrag); | 518 | int dontfrag); |
| @@ -523,13 +523,17 @@ extern void ip6_flush_pending_frames(struct sock *sk); | |||
| 523 | 523 | ||
| 524 | extern int ip6_dst_lookup(struct sock *sk, | 524 | extern int ip6_dst_lookup(struct sock *sk, |
| 525 | struct dst_entry **dst, | 525 | struct dst_entry **dst, |
| 526 | struct flowi *fl); | 526 | struct flowi6 *fl6); |
| 527 | extern int ip6_dst_blackhole(struct sock *sk, | 527 | extern struct dst_entry * ip6_dst_lookup_flow(struct sock *sk, |
| 528 | struct dst_entry **dst, | 528 | struct flowi6 *fl6, |
| 529 | struct flowi *fl); | 529 | const struct in6_addr *final_dst, |
| 530 | extern int ip6_sk_dst_lookup(struct sock *sk, | 530 | bool can_sleep); |
| 531 | struct dst_entry **dst, | 531 | extern struct dst_entry * ip6_sk_dst_lookup_flow(struct sock *sk, |
| 532 | struct flowi *fl); | 532 | struct flowi6 *fl6, |
| 533 | const struct in6_addr *final_dst, | ||
| 534 | bool can_sleep); | ||
| 535 | extern struct dst_entry * ip6_blackhole_route(struct net *net, | ||
| 536 | struct dst_entry *orig_dst); | ||
| 533 | 537 | ||
| 534 | /* | 538 | /* |
| 535 | * skb processing functions | 539 | * skb processing functions |
| @@ -562,7 +566,7 @@ extern int ipv6_ext_hdr(u8 nexthdr); | |||
| 562 | 566 | ||
| 563 | extern int ipv6_find_tlv(struct sk_buff *skb, int offset, int type); | 567 | extern int ipv6_find_tlv(struct sk_buff *skb, int offset, int type); |
| 564 | 568 | ||
| 565 | extern struct in6_addr *fl6_update_dst(struct flowi *fl, | 569 | extern struct in6_addr *fl6_update_dst(struct flowi6 *fl6, |
| 566 | const struct ipv6_txoptions *opt, | 570 | const struct ipv6_txoptions *opt, |
| 567 | struct in6_addr *orig); | 571 | struct in6_addr *orig); |
| 568 | 572 | ||
| @@ -596,8 +600,8 @@ extern int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len); | |||
| 596 | extern int ipv6_recv_rxpmtu(struct sock *sk, struct msghdr *msg, int len); | 600 | extern int ipv6_recv_rxpmtu(struct sock *sk, struct msghdr *msg, int len); |
| 597 | extern void ipv6_icmp_error(struct sock *sk, struct sk_buff *skb, int err, __be16 port, | 601 | extern void ipv6_icmp_error(struct sock *sk, struct sk_buff *skb, int err, __be16 port, |
| 598 | u32 info, u8 *payload); | 602 | u32 info, u8 *payload); |
| 599 | extern void ipv6_local_error(struct sock *sk, int err, struct flowi *fl, u32 info); | 603 | extern void ipv6_local_error(struct sock *sk, int err, struct flowi6 *fl6, u32 info); |
| 600 | extern void ipv6_local_rxpmtu(struct sock *sk, struct flowi *fl, u32 mtu); | 604 | extern void ipv6_local_rxpmtu(struct sock *sk, struct flowi6 *fl6, u32 mtu); |
| 601 | 605 | ||
| 602 | extern int inet6_release(struct socket *sock); | 606 | extern int inet6_release(struct socket *sock); |
| 603 | extern int inet6_bind(struct socket *sock, struct sockaddr *uaddr, | 607 | extern int inet6_bind(struct socket *sock, struct sockaddr *uaddr, |