Merge commit 'origin/master'
This commit is contained in:
commit
46bb7e0d17
1 changed files with 5 additions and 0 deletions
|
@ -1486,13 +1486,18 @@ rt_get_igp_metric(rte *rt)
|
|||
return ea->u.data;
|
||||
|
||||
rta *a = rt->attrs;
|
||||
|
||||
#ifdef CONFIG_OSPF
|
||||
if ((a->source == RTS_OSPF) ||
|
||||
(a->source == RTS_OSPF_IA) ||
|
||||
(a->source == RTS_OSPF_EXT1))
|
||||
return rt->u.ospf.metric1;
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_RIP
|
||||
if (a->source == RTS_RIP)
|
||||
return rt->u.rip.metric;
|
||||
#endif
|
||||
|
||||
/* Device routes */
|
||||
if ((a->dest != RTD_ROUTER) && (a->dest != RTD_MULTIPATH))
|
||||
|
|
Loading…
Reference in a new issue