dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Revert "netrom: zero length frame filtering in NetRom" 

This reverts commit a3ac80a130.

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>
This commit is contained in:
David S. Miller 2009-03-27 17:22:55 -07:00
parent 79675900cb
commit 80e20f6f36
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/netrom/af_netrom.c
View File

@ -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;
@ -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;
@ -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;