Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c44a4366 authored by David S. Miller's avatar David S. Miller
Browse files

Revert "ax25: zero length frame filtering in AX25" 



This reverts commit f99bcff7.

Like netrom, Alan Cox says that zero lengths have real meaning
and are useful in this protocol.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 80e20f6f

net/ax25/af_ax25.c

+0 −12
Original line number Diff line number Diff line
@@ -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;