Commit 29098f0d authored by Hideaki Yoshifuji's avatar Hideaki Yoshifuji

[IPV6] Remove codes related to RTF_ALLONLINK.

Signed-off-by: default avatarHideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
parent bf159569
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
#define _LINUX_IPV6_ROUTE_H #define _LINUX_IPV6_ROUTE_H
#define RTF_DEFAULT 0x00010000 /* default - learned via ND */ #define RTF_DEFAULT 0x00010000 /* default - learned via ND */
#define RTF_ALLONLINK 0x00020000 /* fallback, no routers on link */ #define RTF_ALLONLINK 0x00020000 /* (deprecated and will be removed)
fallback, no routers on link */
#define RTF_ADDRCONF 0x00040000 /* addrconf route - RA */ #define RTF_ADDRCONF 0x00040000 /* addrconf route - RA */
#define RTF_PREFIX_RT 0x00080000 /* A prefix only route - RA */ #define RTF_PREFIX_RT 0x00080000 /* A prefix only route - RA */
......
...@@ -885,7 +885,7 @@ int ipv6_get_saddr(struct dst_entry *dst, ...@@ -885,7 +885,7 @@ int ipv6_get_saddr(struct dst_entry *dst,
if (rt) if (rt)
dev = rt->rt6i_dev; dev = rt->rt6i_dev;
onlink = (rt && (rt->rt6i_flags & RTF_ALLONLINK)); onlink = 0;
return ipv6_dev_get_saddr(dev, daddr, saddr, onlink); return ipv6_dev_get_saddr(dev, daddr, saddr, onlink);
} }
......
...@@ -433,7 +433,7 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt, ...@@ -433,7 +433,7 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt,
if (fn->fn_flags&RTN_TL_ROOT && if (fn->fn_flags&RTN_TL_ROOT &&
fn->leaf == &ip6_null_entry && fn->leaf == &ip6_null_entry &&
!(rt->rt6i_flags & (RTF_DEFAULT | RTF_ADDRCONF | RTF_ALLONLINK)) ){ !(rt->rt6i_flags & (RTF_DEFAULT | RTF_ADDRCONF)) ){
fn->leaf = rt; fn->leaf = rt;
rt->u.next = NULL; rt->u.next = NULL;
goto out; goto out;
......
...@@ -1026,7 +1026,7 @@ static void ndisc_router_discovery(struct sk_buff *skb) ...@@ -1026,7 +1026,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
* delete it * delete it
*/ */
rt6_purge_dflt_routers(RTF_ALLONLINK); rt6_purge_dflt_routers(0);
} }
if (rt) if (rt)
......
...@@ -1293,10 +1293,7 @@ void rt6_purge_dflt_routers(int last_resort) ...@@ -1293,10 +1293,7 @@ void rt6_purge_dflt_routers(int last_resort)
struct rt6_info *rt; struct rt6_info *rt;
u32 flags; u32 flags;
if (last_resort) flags = RTF_DEFAULT | RTF_ADDRCONF;
flags = RTF_ALLONLINK;
else
flags = RTF_DEFAULT | RTF_ADDRCONF;
restart: restart:
read_lock_bh(&rt6_lock); read_lock_bh(&rt6_lock);
...@@ -1592,7 +1589,7 @@ static int rt6_fill_node(struct sk_buff *skb, struct rt6_info *rt, ...@@ -1592,7 +1589,7 @@ static int rt6_fill_node(struct sk_buff *skb, struct rt6_info *rt,
rtm->rtm_protocol = rt->rt6i_protocol; rtm->rtm_protocol = rt->rt6i_protocol;
if (rt->rt6i_flags&RTF_DYNAMIC) if (rt->rt6i_flags&RTF_DYNAMIC)
rtm->rtm_protocol = RTPROT_REDIRECT; rtm->rtm_protocol = RTPROT_REDIRECT;
else if (rt->rt6i_flags&(RTF_ADDRCONF|RTF_ALLONLINK)) else if (rt->rt6i_flags & RTF_ADDRCONF)
rtm->rtm_protocol = RTPROT_KERNEL; rtm->rtm_protocol = RTPROT_KERNEL;
else if (rt->rt6i_flags&RTF_DEFAULT) else if (rt->rt6i_flags&RTF_DEFAULT)
rtm->rtm_protocol = RTPROT_RA; rtm->rtm_protocol = RTPROT_RA;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment