| Message ID | 1443021322-48621-4-git-send-email-dsa@cumulusnetworks.com |
|---|---|
| State | Rejected, archived |
| Delegated to: | David Miller |
| Headers | show |
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 3c5000db5972..e3b18cc1952f 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -1805,8 +1805,10 @@ out: return err; rth = rt_dst_alloc(net->loopback_dev, flags | RTCF_LOCAL, res.type, IN_DEV_CONF_GET(in_dev, NOPOLICY), false, do_cache); - if (!rth) - goto e_nobufs; + if (!rth) { + err = -ENOBUFS; + goto out; + } rth->dst.output= ip_rt_bug; #ifdef CONFIG_IP_ROUTE_CLASSID @@ -1852,10 +1854,6 @@ out: return err; #endif goto out; -e_nobufs: - err = -ENOBUFS; - goto out; - martian_source: ip_handle_martian_source(dev, in_dev, skb, daddr, saddr); goto out;
e_nobufs has 1 user. Move setting err to -ENOBUFS for the 1 user and use the goto out label instead of e_nobufs. Stepping stone patch; next one moves rth code into a helper function. Signed-off-by: David Ahern <dsa@cumulusnetworks.com> --- net/ipv4/route.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)