summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2003-04-22 22:50:53 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2003-04-22 22:50:53 -0700
commit70ced8bfb70ae687cd39c3ffc047cd345c4bb00f (patch)
treebf3de613a67e818253a6415abe4d51606d70d3e8 /include/net
parentb3d4c0270080c88e41704740ff9f413ce4067715 (diff)
parent6febb77650e96402767132b69b229fc3ae2f6ca4 (diff)
Merge bk://kernel.bkbits.net/davem/net-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/net')
-rw-r--r--include/net/ip6_route.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 1a5c99c5afa2..1af054ea6385 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -59,7 +59,7 @@ extern struct rt6_info *rt6_lookup(struct in6_addr *daddr,
struct in6_addr *saddr,
int oif, int flags);
-extern struct rt6_info *ndisc_get_dummy_rt(void);
+extern struct rt6_info *ip6_dst_alloc(void);
/*
* support functions for ND