From: Fabian Frederick <fabf@skynet.be>
Date: Wed, 29 Oct 2014 11:57:51 +0000 (+0100)
Subject: ipv6: remove assignment in if condition
X-Git-Tag: firefly_0821_release~176^2~2717^2~314
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=43728fa5c5e475e6f0059ec739e715fc49e4a478;p=firefly-linux-kernel-4.4.55.git

ipv6: remove assignment in if condition

Do assignment before if condition and test !skb like in rawv6_recvmsg()

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 896af8807979..075a0fb400e7 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -548,7 +548,8 @@ static int rawv6_push_pending_frames(struct sock *sk, struct flowi6 *fl6,
 	if (!rp->checksum)
 		goto send;
 
-	if ((skb = skb_peek(&sk->sk_write_queue)) == NULL)
+	skb = skb_peek(&sk->sk_write_queue);
+	if (!skb)
 		goto out;
 
 	offset = rp->offset;