summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-04-14 20:28:00 -0700
committerDavid S. Miller <davem@davemloft.net>2009-04-14 20:28:00 -0700
commit6fd4777a1fec1f7757b5a302ad3fdcc1eae2abba (patch)
tree620a872de67c78c392ed92a93810557da72fb86f
parent239795adf7f1a40cf0be0e05544d37706c9b4cf9 (diff)
downloadblackbird-op-linux-6fd4777a1fec1f7757b5a302ad3fdcc1eae2abba.tar.gz
blackbird-op-linux-6fd4777a1fec1f7757b5a302ad3fdcc1eae2abba.zip
Revert "rose: zero length frame filtering in af_rose.c"
This reverts commit 244f46ae6e9e18f6fc0be7d1f49febde4762c34b. Alan Cox did the research, and just like the other radio protocols zero-length frames have meaning because at the top level ROSE is X.25 PLP. So this zero-length filtering is invalid. Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/rose/af_rose.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 0f36e8d59b29..877a7f65f707 100644
--- a/net/rose/af_rose.c
+++ b/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;
OpenPOWER on IntegriCloud