Skip to content

Commit

Permalink
Revert "ax25: zero length frame filtering in AX25"
Browse files Browse the repository at this point in the history
This reverts commit f99bcff.

Like netrom, Alan Cox says that zero lengths have real 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 80e20f6 commit c44a436
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions net/ax25/af_ax25.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit c44a436

Please sign in to comment.