summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-03-27 17:23:42 -0700
committerDavid S. Miller <davem@davemloft.net>2009-03-27 17:23:42 -0700
commitc44a4366649aca4f5b4a51ff71d4c9cde3b7c9da (patch)
tree7c0a293ab86f07c584d679739253dc4c2cc8d45f /net
parent80e20f6f360078b4852eac6825883e5aa25564bb (diff)
downloadop-kernel-dev-c44a4366649aca4f5b4a51ff71d4c9cde3b7c9da.zip
op-kernel-dev-c44a4366649aca4f5b4a51ff71d4c9cde3b7c9da.tar.gz
Revert "ax25: zero length frame filtering in AX25"
This reverts commit f99bcff7a290768e035f3d4726e103c6ebe858bf. 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>
Diffstat (limited to 'net')
-rw-r--r--net/ax25/af_ax25.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 7da5ebb..fd9d06f 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -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;
OpenPOWER on IntegriCloud