diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2010-05-07 13:33:18 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2010-05-07 13:33:18 +0000 |
| commit | 043b0fc8cb63b379ff2757ab2d64bf2b4c8c2cb7 (patch) | |
| tree | 18ea5d2f321a9a8ea43ecdd326acada9de6ae943 /sys/net/if_ethersubr.c | |
| parent | 6bcd6fa8c9cab428fd9f7d850e1771ff3f94d451 (diff) | |
Start cleaning up the mess called rtalloc*. Kill rtalloc2, make rtalloc1
accept flags for report and nocloning. Move the rtableid into struct route
(with a minor twist for now) and make a few more codepathes rdomain aware.
Appart from the pf.c and route.c bits the diff is mostly mechanical.
More to come...
OK michele, henning
Diffstat (limited to 'sys/net/if_ethersubr.c')
| -rw-r--r-- | sys/net/if_ethersubr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 2acad152bfc..0e2ab27b3d3 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ethersubr.c,v 1.141 2010/05/01 08:14:26 mk Exp $ */ +/* $OpenBSD: if_ethersubr.c,v 1.142 2010/05/07 13:33:16 claudio Exp $ */ /* $NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $ */ /* @@ -271,7 +271,7 @@ ether_output(ifp0, m0, dst, rt0) senderr(ENETDOWN); if ((rt = rt0) != NULL) { if ((rt->rt_flags & RTF_UP) == 0) { - if ((rt0 = rt = rtalloc1(dst, 1, + if ((rt0 = rt = rtalloc1(dst, RT_REPORT, m->m_pkthdr.rdomain)) != NULL) rt->rt_refcnt--; else @@ -288,8 +288,8 @@ ether_output(ifp0, m0, dst, rt0) goto lookup; if (((rt = rt->rt_gwroute)->rt_flags & RTF_UP) == 0) { rtfree(rt); rt = rt0; - lookup: rt->rt_gwroute = rtalloc1(rt->rt_gateway, 1, - ifp->if_rdomain); + lookup: rt->rt_gwroute = rtalloc1(rt->rt_gateway, + RT_REPORT, ifp->if_rdomain); if ((rt = rt->rt_gwroute) == 0) senderr(EHOSTUNREACH); } |