From 1d98910817e3c81302d2bb89617553c2ed89ea8b Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 14 Apr 2009 20:28:00 -0700
Subject: [PATCH] --- yaml --- r: 143460 b: refs/heads/master c:
 6fd4777a1fec1f7757b5a302ad3fdcc1eae2abba h: refs/heads/master v: v3

---
 [refs]                   |  2 +-
 trunk/net/rose/af_rose.c | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index ec485b5463ac..4e5cd255d26b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 239795adf7f1a40cf0be0e05544d37706c9b4cf9
+refs/heads/master: 6fd4777a1fec1f7757b5a302ad3fdcc1eae2abba
diff --git a/trunk/net/rose/af_rose.c b/trunk/net/rose/af_rose.c
index 0f36e8d59b29..877a7f65f707 100644
--- a/trunk/net/rose/af_rose.c
+++ b/trunk/net/rose/af_rose.c
@@ -1072,10 +1072,6 @@ static int rose_sendmsg(struct kiocb *iocb, struct socket *sock,
 	unsigned char *asmptr;
 	int n, size, qbit = 0;
 
-	/* ROSE empty frame has no meaning : don't send */
-	if (len == 0)
-		return 0;
-
 	if (msg->msg_flags & ~(MSG_DONTWAIT|MSG_EOR|MSG_CMSG_COMPAT))
 		return -EINVAL;
 
@@ -1273,12 +1269,6 @@ static int rose_recvmsg(struct kiocb *iocb, struct socket *sock,
 	skb_reset_transport_header(skb);
 	copied     = skb->len;
 
-	/* ROSE empty frame has no meaning : ignore it */
-	if (copied == 0) {
-		skb_free_datagram(sk, skb);
-		return copied;
-	}
-
 	if (copied > size) {
 		copied = size;
 		msg->msg_flags |= MSG_TRUNC;