From c281284b501e05118d3330784f220e9b707becb4 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Fri, 27 Mar 2009 17:23:42 -0700
Subject: [PATCH] --- yaml --- r: 136107 b: refs/heads/master c:
 c44a4366649aca4f5b4a51ff71d4c9cde3b7c9da h: refs/heads/master i:   136105:
 af5a3347d1d6f059c0ab5e1ff897e34e02aacf7c   136103:
 518320618aadb9cad594a4ae4892a30869261a57 v: v3

---
 [refs]                   |  2 +-
 trunk/net/ax25/af_ax25.c | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 73d45397b7cc..288e48827681 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80e20f6f360078b4852eac6825883e5aa25564bb
+refs/heads/master: c44a4366649aca4f5b4a51ff71d4c9cde3b7c9da
diff --git a/trunk/net/ax25/af_ax25.c b/trunk/net/ax25/af_ax25.c
index 7da5ebb84e97..fd9d06f291dc 100644
--- a/trunk/net/ax25/af_ax25.c
+++ b/trunk/net/ax25/af_ax25.c
@@ -1435,11 +1435,6 @@ static int ax25_sendmsg(struct kiocb *iocb, struct socket *sock,
 	size_t size;
 	int lv, err, addr_len = msg->msg_namelen;
 
-	/* AX.25 empty data 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;
 
@@ -1639,13 +1634,6 @@ static int ax25_recvmsg(struct kiocb *iocb, struct socket *sock,
 	skb_reset_transport_header(skb);
 	copied = skb->len;
 
-	/* AX.25 empty data frame has no meaning : ignore it */
-	if (copied == 0) {
-		err = copied;
-		skb_free_datagram(sk, skb);
-		goto out;
-	}
-
 	if (copied > size) {
 		copied = size;
 		msg->msg_flags |= MSG_TRUNC;