Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83d7eb29 authored by Dan Carpenter's avatar Dan Carpenter Committed by David S. Miller
Browse files

ipv6: cleanup: remove unneeded null check 



We dereference "sk" unconditionally elsewhere in the function.  

This was left over from:  b30bd282 "ip6_xmit: remove unnecessary NULL
ptr check".  According to that commit message, "the sk argument to 
ip6_xmit is never NULL nowadays since the skb->priority assigment 
expects a valid socket."

Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4b021628

net/ipv6/ip6_output.c

+1 −2
Original line number Diff line number Diff line
@@ -218,7 +218,6 @@ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl, 
			}

			kfree_skb(skb);

			skb = skb2;

			if (sk)

			skb_set_owner_w(skb, sk);

		}

		if (opt->opt_flen)