Merge tag 'erofs-for-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang...

[linux-2.6-microblaze.git] / net / ipv6 / rpl_iptunnel.c

diff --git a/net/ipv6/rpl_iptunnel.c b/net/ipv6/rpl_iptunnel.c
index 233da43..ff691d9 100644 (file)
--- a/net/ipv6/rpl_iptunnel.c
+++ b/net/ipv6/rpl_iptunnel.c
@@ -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)