diff options
| author | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
| commit | 115b384cf87249d76adb0b21aca11ee22128927d (patch) | |
| tree | f39a2a54863e9d82d1196906f92c82ab5991c6af /include/net/ipv6.h | |
| parent | 8eb7925f93af75e66a240d148efdec212f95bcb7 (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge ../linus
Diffstat (limited to 'include/net/ipv6.h')
| -rw-r--r-- | include/net/ipv6.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index a8fdf7970b37..ece7e8a84ffd 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h | |||
| @@ -468,6 +468,9 @@ extern void ip6_flush_pending_frames(struct sock *sk); | |||
| 468 | extern int ip6_dst_lookup(struct sock *sk, | 468 | extern int ip6_dst_lookup(struct sock *sk, |
| 469 | struct dst_entry **dst, | 469 | struct dst_entry **dst, |
| 470 | struct flowi *fl); | 470 | struct flowi *fl); |
| 471 | extern int ip6_sk_dst_lookup(struct sock *sk, | ||
| 472 | struct dst_entry **dst, | ||
| 473 | struct flowi *fl); | ||
| 471 | 474 | ||
| 472 | /* | 475 | /* |
| 473 | * skb processing functions | 476 | * skb processing functions |