Revert "net/sched: act_connmark: handle errno on tcf_idr_check_alloc" This reverts commit 652b24f07bae56e3e690b7f6516c238481376b59 which is commit fb07390463c95e6eef254044d6dde050bfb9807a upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: I721e2f4251051d550a3c22ce2171b5fb886e4b65 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
diff --git a/net/sched/act_connmark.c b/net/sched/act_connmark.c index 505f9cf..0deb4e9 100644 --- a/net/sched/act_connmark.c +++ b/net/sched/act_connmark.c
@@ -160,9 +160,6 @@ static int tcf_connmark_init(struct net *net, struct nlattr *nla, if (goto_ch) tcf_chain_put_by_act(goto_ch); ret = 0; - } else { - err = ret; - goto out_free; } return ret;