|
@@ -1037,10 +1037,6 @@ static int nr_sendmsg(struct kiocb *iocb, struct socket *sock,
|
|
unsigned char *asmptr;
|
|
unsigned char *asmptr;
|
|
int size;
|
|
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))
|
|
if (msg->msg_flags & ~(MSG_DONTWAIT|MSG_EOR|MSG_CMSG_COMPAT))
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|
|
@@ -1175,11 +1171,6 @@ static int nr_recvmsg(struct kiocb *iocb, struct socket *sock,
|
|
skb_reset_transport_header(skb);
|
|
skb_reset_transport_header(skb);
|
|
copied = skb->len;
|
|
copied = skb->len;
|
|
|
|
|
|
- /* NetRom empty data frame has no meaning : ignore it */
|
|
|
|
- if (copied == 0) {
|
|
|
|
- goto out;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
if (copied > size) {
|
|
if (copied > size) {
|
|
copied = size;
|
|
copied = size;
|
|
msg->msg_flags |= MSG_TRUNC;
|
|
msg->msg_flags |= MSG_TRUNC;
|
|
@@ -1195,7 +1186,7 @@ static int nr_recvmsg(struct kiocb *iocb, struct socket *sock,
|
|
|
|
|
|
msg->msg_namelen = sizeof(*sax);
|
|
msg->msg_namelen = sizeof(*sax);
|
|
|
|
|
|
-out: skb_free_datagram(sk, skb);
|
|
|
|
|
|
+ skb_free_datagram(sk, skb);
|
|
|
|
|
|
release_sock(sk);
|
|
release_sock(sk);
|
|
return copied;
|
|
return copied;
|