Skip to content

Commit

Permalink
Revert "netrom: zero length frame filtering in NetRom"
Browse files Browse the repository at this point in the history
This reverts commit a3ac80a.

Alan Cox says that zero length writes do have special meaning
and are useful in this protocol.

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Mar 28, 2009
1 parent 7967590 commit 80e20f6
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions net/netrom/af_netrom.c
Original file line number Diff line number Diff line change
Expand Up @@ -1037,10 +1037,6 @@ static int nr_sendmsg(struct kiocb *iocb, struct socket *sock,
unsigned char *asmptr;
int size;

/* Netrom 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;

Expand Down Expand Up @@ -1175,11 +1171,6 @@ static int nr_recvmsg(struct kiocb *iocb, struct socket *sock,
skb_reset_transport_header(skb);
copied = skb->len;

/* NetRom empty data frame has no meaning : ignore it */
if (copied == 0) {
goto out;
}

if (copied > size) {
copied = size;
msg->msg_flags |= MSG_TRUNC;
Expand All @@ -1195,7 +1186,7 @@ static int nr_recvmsg(struct kiocb *iocb, struct socket *sock,

msg->msg_namelen = sizeof(*sax);

out: skb_free_datagram(sk, skb);
skb_free_datagram(sk, skb);

release_sock(sk);
return copied;
Expand Down

0 comments on commit 80e20f6

Please sign in to comment.