From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 9 Jun 2019 07:55:08 +0000 (+0200)
Subject: Revert "fib_rules: fix error in backport of e9919a24d302 ("fib_rules: return 0...")"
X-Git-Tag: v4.9.181~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=73a1cbfe8ece62bf88932a5f69f5db1b616ccdd6;p=platform%2Fkernel%2Flinux-amlogic.git

Revert "fib_rules: fix error in backport of e9919a24d302 ("fib_rules: return 0...")"

This reverts commit d5c71a7c533e88a9fcc74fe1b5c25743868fa300 as the
patch that this "fixes" is about to be reverted...

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index c03dd2104d33..bb26457e8c21 100644
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -430,7 +430,6 @@ int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr *nlh)
 		goto errout_free;
 
 	if (rule_exists(ops, frh, tb, rule)) {
-		err = 0;
 		if (nlh->nlmsg_flags & NLM_F_EXCL)
 			err = -EEXIST;
 		goto errout_free;