diff options
| author | melifaro <melifaro@FreeBSD.org> | 2014-04-29 12:52:36 +0000 |
|---|---|---|
| committer | melifaro <melifaro@FreeBSD.org> | 2014-04-29 12:52:36 +0000 |
| commit | b1337c7d4cc6ee167ff7de43b69332e6371e44b6 (patch) | |
| tree | 1da4434e04a79c078d7e6d42e466fb98620f72d3 | |
| parent | 9eab6db97fccd07e9e4b83f50ee19b6fc966db6a (diff) | |
| download | FreeBSD-src-b1337c7d4cc6ee167ff7de43b69332e6371e44b6.zip FreeBSD-src-b1337c7d4cc6ee167ff7de43b69332e6371e44b6.tar.gz | |
Do not use senderr() in rtrequest1_fib_change().
Suggested by: glebius
MFC after: 4 weeks
| -rw-r--r-- | sys/net/route.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/net/route.c b/sys/net/route.c index 0feadb8..ba86fec 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -1431,7 +1431,6 @@ bad: #undef ifpaddr #undef flags -#define senderr(e) { error = e; goto bad; } static int rtrequest1_fib_change(struct radix_node_head *rnh, struct rt_addrinfo *info, struct rtentry **ret_nrt, u_int fibnum) @@ -1476,7 +1475,7 @@ rtrequest1_fib_change(struct radix_node_head *rnh, struct rt_addrinfo *info, free_ifa = 1; if (error != 0) - senderr(error); + goto bad; } /* Check if outgoing interface has changed */ @@ -1489,7 +1488,7 @@ rtrequest1_fib_change(struct radix_node_head *rnh, struct rt_addrinfo *info, if (info->rti_info[RTAX_GATEWAY] != NULL) { error = rt_setgate(rt, rt_key(rt), info->rti_info[RTAX_GATEWAY]); if (error != 0) - senderr(error); + goto bad; rt->rt_flags &= ~RTF_GATEWAY; rt->rt_flags |= (RTF_GATEWAY & info->rti_flags); @@ -1517,8 +1516,6 @@ bad: ifa_free(info->rti_ifa); return (error); } -#undef senderr - int rt_setgate(struct rtentry *rt, struct sockaddr *dst, struct sockaddr *gate) |
