---

yaml --- r: 2271 b: refs/heads/master c: 5418c69 h: refs/heads/master i: 2269: 693cfe9 2267: 3b12bfb 2263: fd685f9 2255: 6e411a4 2239: f50ae82 v: v3
git-mirror · Jun 19, 2005 · adbe69e · adbe69e
1 parent 3b36f71
commit adbe69e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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)