]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: ipv6: rpl_iptunnel: simplify the return expression of rpl_do_srh()
authorZheng Yongjun <zhengyongjun3@huawei.com>
Tue, 8 Dec 2020 12:09:49 +0000 (20:09 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Mar 2025 11:47:32 +0000 (12:47 +0100)
[ Upstream commit 9faad250ce66ed4159fa095a269690d7cfdb3ce3 ]

Simplify the return expression.

Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Stable-dep-of: 13e55fbaec17 ("net: ipv6: fix dst ref loop on input in rpl lwt")
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/ipv6/rpl_iptunnel.c

index 274593b7c6107e06c89185f9bd0a907e6db1cf81..df835dfcc5b7097cfe16b4f0f28fe10e8089605b 100644 (file)
@@ -190,18 +190,13 @@ static int rpl_do_srh(struct sk_buff *skb, const struct rpl_lwt *rlwt)
 {
        struct dst_entry *dst = skb_dst(skb);
        struct rpl_iptunnel_encap *tinfo;
-       int err = 0;
 
        if (skb->protocol != htons(ETH_P_IPV6))
                return -EINVAL;
 
        tinfo = rpl_encap_lwtunnel(dst->lwtstate);
 
-       err = rpl_do_srh_inline(skb, rlwt, tinfo->srh);
-       if (err)
-               return err;
-
-       return 0;
+       return rpl_do_srh_inline(skb, rlwt, tinfo->srh);
 }
 
 static int rpl_output(struct net *net, struct sock *sk, struct sk_buff *skb)