diff options
| author | David S. Miller <davem@nuts.davemloft.net> | 2004-08-18 18:39:35 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2004-08-18 18:39:35 -0700 |
| commit | effef85f00d41126dbc188b8e98685c77fae7883 (patch) | |
| tree | 8313f2cfb21a3921448056966baefca11d7462f3 /include/net | |
| parent | 4471649367b4104d18d5f679f6cb1c4065dd23b1 (diff) | |
| parent | 6dad59bb4069702e01a4653f321b295450cca5c9 (diff) | |
Merge nuts.davemloft.net:/disk1/BK/ip6route-2.6
into nuts.davemloft.net:/disk1/BK/net-2.6
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/if_inet6.h | 2 | ||||
| -rw-r--r-- | include/net/ip6_route.h | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h index 48280b138cb9..76ce5f8b6c1e 100644 --- a/include/net/if_inet6.h +++ b/include/net/if_inet6.h @@ -51,6 +51,7 @@ struct inet6_ifaddr struct timer_list timer; struct inet6_dev *idev; + struct rt6_info *rt; struct inet6_ifaddr *lst_next; /* next addr in addr_lst */ struct inet6_ifaddr *if_next; /* next addr in inet6_dev */ @@ -133,6 +134,7 @@ struct ifacaddr6 { struct in6_addr aca_addr; struct inet6_dev *aca_idev; + struct rt6_info *aca_rt; struct ifacaddr6 *aca_next; int aca_users; atomic_t aca_refcnt; diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index f5229c50d35f..dbfe1d6923fd 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -42,6 +42,9 @@ extern int ipv6_route_ioctl(unsigned int cmd, void __user *arg); extern int ip6_route_add(struct in6_rtmsg *rtmsg, struct nlmsghdr *, void *rtattr); +extern int ip6_ins_rt(struct rt6_info *, + struct nlmsghdr *, + void *rtattr); extern int ip6_del_rt(struct rt6_info *, struct nlmsghdr *, void *rtattr); @@ -71,6 +74,10 @@ extern struct dst_entry *ndisc_dst_alloc(struct net_device *dev, extern int ndisc_dst_gc(int *more); extern void fib6_force_start_gc(void); +extern struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev, + const struct in6_addr *addr, + int anycast); + /* * support functions for ND * |