Re: [PATCH net-next] net: ipv4: remove unnecessary check on orig_oif

2017-08-13 Thread David Miller 
From: David Ahern 
Date: Fri, 11 Aug 2017 17:02:02 -0700

> rt_iif is going to be set to either 0 or orig_oif. If orig_oif
> is 0 it amounts to the same end result so remove the check.
> 
> Signed-off-by: David Ahern 

Applied, thanks David.

[PATCH net-next] net: ipv4: remove unnecessary check on orig_oif

2017-08-11 Thread David Ahern 
rt_iif is going to be set to either 0 or orig_oif. If orig_oif
is 0 it amounts to the same end result so remove the check.

Signed-off-by: David Ahern 
---
 net/ipv4/route.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 6324ade81a81..9c9895a6fc0f 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2237,7 +2237,7 @@ static struct rtable *__mkroute_output(const struct 
fib_result *res,
if (!rth)
return ERR_PTR(-ENOBUFS);
 
-   rth->rt_iif = orig_oif ? : 0;
+   rth->rt_iif = orig_oif;
if (res->table)
rth->rt_table_id = res->table->tb_id;
 
-- 
2.1.4