2014-10-29 11:58:12

by Fabian Frédérick

Subject: [PATCH 1/1 net-next] ipv6: remove assignment in if condition

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

Signed-off-by: Fabian Frederick <[email protected]>
---
net/ipv6/raw.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 896af88..075a0fb 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;
--
1.9.3

2014-10-30 19:53:04

by David Miller

Subject: Re: [PATCH 1/1 net-next] ipv6: remove assignment in if condition

From: Fabian Frederick <[email protected]>
Date: Wed, 29 Oct 2014 12:57:51 +0100

> Do assignment before if condition and test !skb like in rawv6_recvmsg()
>
> Signed-off-by: Fabian Frederick <[email protected]>

Applied.