From adbe69ea6c7a1009e25f31ea075fada3a9a2fb34 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <juhl-lkml@dif.dk>
Date: Sat, 18 Jun 2005 22:59:45 -0700
Subject: [PATCH] --- yaml --- r: 2271 b: refs/heads/master c:
 5418c6926fcb0e5a324cd5bc1106fc0941db7aae h: refs/heads/master i:   2269:
 693cfe9dd620e50ebf42972120a3a561a170912f   2267:
 3b12bfb58c6c46a1c7a33d04a5b2948c732bd6e2   2263:
 fd685f9f38b684963759f9bbf4b0cc97e050dcc1   2255:
 6e411a44f8ac76ea0f19d3f698dad37af8e14d79   2239:
 f50ae827c8d29c2a8a002c63cda8b4d05aaacecc v: v3

---
 [refs]               |  2 +-
 trunk/net/ipv4/raw.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 76fefc1835f0..a6873d5a3ed4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94df109a8c802263837baccc1a3eeab9ab9e88db
+refs/heads/master: 5418c6926fcb0e5a324cd5bc1106fc0941db7aae
diff --git a/trunk/net/ipv4/raw.c b/trunk/net/ipv4/raw.c
index 8c1512021ee8..8d17dd3542df 100644
--- a/trunk/net/ipv4/raw.c
+++ b/trunk/net/ipv4/raw.c
@@ -514,7 +514,10 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 		kfree(ipc.opt);
 	ip_rt_put(rt);
 
-out:	return err < 0 ? err : len;
+out:
+	if (err < 0)
+		return err;
+	return len;
 
 do_confirm:
 	dst_confirm(&rt->u.dst);
@@ -610,7 +613,10 @@ static int raw_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 		copied = skb->len;
 done:
 	skb_free_datagram(sk, skb);
-out:	return err ? err : copied;
+out:
+	if (err)
+		return err;
+	return copied;
 }
 
 static int raw_init(struct sock *sk)