summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKazunori Miyazawa <kazunori@miyazawa.org>2004-02-10 18:37:48 -0800
committerHideaki Yoshifuji <yoshfuji@linux-ipv6.org>2004-02-10 18:37:48 -0800
commita52dca4ece3b555434e8b04ae0dd7c4f196823d9 (patch)
tree1ebdfe80d169b2236a09b9b1c513da474a6b6abe /include
parent8fcb12575ca80babceb636047cd104e41bbb8b71 (diff)
[IPV6]: Unify ipv6 output routine.
Diffstat (limited to 'include')
-rw-r--r--include/linux/ipv6_route.h1
-rw-r--r--include/net/ip6_route.h1
-rw-r--r--include/net/ipv6.h1
3 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/ipv6_route.h b/include/linux/ipv6_route.h
index 3a279f106325..46d8b7e8b1aa 100644
--- a/include/linux/ipv6_route.h
+++ b/include/linux/ipv6_route.h
@@ -24,7 +24,6 @@
#define RTF_CACHE 0x01000000 /* cache entry */
#define RTF_FLOW 0x02000000 /* flow significant route */
#define RTF_POLICY 0x04000000 /* policy route */
-#define RTF_NDISC 0x08000000 /* ndisc route */
#define RTF_LOCAL 0x80000000
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 8654632ff46f..794ff3547dbf 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -64,6 +64,7 @@ extern struct rt6_info *rt6_lookup(struct in6_addr *daddr,
extern struct dst_entry *ndisc_dst_alloc(struct net_device *dev,
struct neighbour *neigh,
+ struct in6_addr *addr,
int (*output)(struct sk_buff *));
extern int ndisc_dst_gc(int *more);
extern void fib6_force_start_gc(void);
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 1ad89018e99b..96319fad283a 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -355,6 +355,7 @@ extern int ip6_dst_lookup(struct sock *sk,
*/
extern int ip6_output(struct sk_buff *skb);
+extern int ip6_output2(struct sk_buff *skb);
extern int ip6_forward(struct sk_buff *skb);
extern int ip6_input(struct sk_buff *skb);
extern int ip6_mc_input(struct sk_buff *skb);