diff options
| author | glebius <glebius@FreeBSD.org> | 2014-03-19 09:23:58 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2014-03-19 09:23:58 +0000 |
| commit | 73a339242daca126752a08f5390d85b17a8f0436 (patch) | |
| tree | 93b6e16b3d666b40e253b334a66229c5a6a33179 | |
| parent | 9fe35c7245f21b37300ade221685cbd2b5a4019b (diff) | |
| download | FreeBSD-src-73a339242daca126752a08f5390d85b17a8f0436.zip FreeBSD-src-73a339242daca126752a08f5390d85b17a8f0436.tar.gz | |
Merge r262747: remove extraneous ifa_ref()/ifa_free().
| -rw-r--r-- | sys/netinet/ip_output.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 2d8be1b..bee37a7 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -295,7 +295,6 @@ again: goto bad; } ia = ifatoia(rte->rt_ifa); - ifa_ref(&ia->ia_ifa); ifp = rte->rt_ifp; rte->rt_rmx.rmx_pksent++; if (rte->rt_flags & RTF_GATEWAY) @@ -532,11 +531,8 @@ sendit: #endif error = netisr_queue(NETISR_IP, m); goto done; - } else { - if (ia != NULL) - ifa_free(&ia->ia_ifa); + } else goto again; /* Redo the routing table lookup. */ - } } /* See if local, if yes, send it to netisr with IP_FASTFWD_OURS. */ @@ -565,8 +561,6 @@ sendit: m->m_flags |= M_SKIP_FIREWALL; m->m_flags &= ~M_IP_NEXTHOP; m_tag_delete(m, fwd_tag); - if (ia != NULL) - ifa_free(&ia->ia_ifa); goto again; } @@ -677,8 +671,6 @@ passout: done: if (ro == &iproute) RO_RTFREE(ro); - if (ia != NULL) - ifa_free(&ia->ia_ifa); return (error); bad: m_freem(m); |
