summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-05-01 01:42:08 +0200
committerDavid S. Miller <davem@davemloft.net>2010-05-01 01:42:08 +0200
commit83d7eb2979cd3390c375470225dd2d8f2009bc70 (patch)
tree9f387e28439c113772af962c1b6da9a1f7731f32
parentxfrm: potential uninitialized variable num_xfrms (diff)
downloadlinux-83d7eb2979cd3390c375470225dd2d8f2009bc70.tar.xz
linux-83d7eb2979cd3390c375470225dd2d8f2009bc70.zip
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: Dan Carpenter <error27@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv6/ip6_output.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 7db09c3f5289..e7a5f17d5e95 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -218,8 +218,7 @@ 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);
+ skb_set_owner_w(skb, sk);
}
if (opt->opt_flen)
ipv6_push_frag_opts(skb, opt, &proto);