diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
| commit | 0a7d5f8ce960e74fa22986bda4af488539796e49 (patch) | |
| tree | e29ad17808a5c3410518e22dae8dfe94801b59f3 /include/net/ipv6.h | |
| parent | 0165508c80a2b5d5268d9c5dfa9b30c534a33693 (diff) | |
| parent | dc709bd190c130b299ac19d596594256265c042a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 |