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

Commit 81d54ec8 authored by Gerrit Renker's avatar Gerrit Renker Committed by David S. Miller
Browse files

udp: remove redundant variable 



The variable 'copied' is used in udp_recvmsg() to emphasize that the passed
'len' is adjusted to fit the actual datagram length. But the same can be
done by adjusting 'len' directly. This patch thus removes the indirection.

Signed-off-by: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 55d95590

net/ipv4/udp.c

+7 −8
Original line number Diff line number Diff line
@@ -1117,7 +1117,7 @@ int udp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 
	struct inet_sock *inet = inet_sk(sk);

	struct sockaddr_in *sin = (struct sockaddr_in *)msg->msg_name;

	struct sk_buff *skb;

	unsigned int ulen, copied;

	unsigned int ulen;

	int peeked;

	int err;

	int is_udplite = IS_UDPLITE(sk);
@@ -1138,10 +1138,9 @@ int udp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 
		goto out;



	ulen = skb->len - sizeof(struct udphdr);

	copied = len;

	if (copied > ulen)

		copied = ulen;

	else if (copied < ulen)

	if (len > ulen)

		len = ulen;

	else if (len < ulen)

		msg->msg_flags |= MSG_TRUNC;



	/*
@@ -1150,14 +1149,14 @@ int udp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 
	 * coverage checksum (UDP-Lite), do it before the copy.

	 */



	if (copied < ulen || UDP_SKB_CB(skb)->partial_cov) {

	if (len < ulen || UDP_SKB_CB(skb)->partial_cov) {

		if (udp_lib_checksum_complete(skb))

			goto csum_copy_err;

	}



	if (skb_csum_unnecessary(skb))

		err = skb_copy_datagram_iovec(skb, sizeof(struct udphdr),

					      msg->msg_iov, copied);

					      msg->msg_iov, len);

	else {

		err = skb_copy_and_csum_datagram_iovec(skb,

						       sizeof(struct udphdr),
@@ -1186,7 +1185,7 @@ int udp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 
	if (inet->cmsg_flags)

		ip_cmsg_recv(msg, skb);



	err = copied;

	err = len;

	if (flags & MSG_TRUNC)

		err = ulen;

net/ipv6/udp.c

+7 −8
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ int udpv6_recvmsg(struct kiocb *iocb, struct sock *sk, 
	struct ipv6_pinfo *np = inet6_sk(sk);

	struct inet_sock *inet = inet_sk(sk);

	struct sk_buff *skb;

	unsigned int ulen, copied;

	unsigned int ulen;

	int peeked;

	int err;

	int is_udplite = IS_UDPLITE(sk);
@@ -341,10 +341,9 @@ int udpv6_recvmsg(struct kiocb *iocb, struct sock *sk, 
		goto out;



	ulen = skb->len - sizeof(struct udphdr);

	copied = len;

	if (copied > ulen)

		copied = ulen;

	else if (copied < ulen)

	if (len > ulen)

		len = ulen;

	else if (len < ulen)

		msg->msg_flags |= MSG_TRUNC;



	is_udp4 = (skb->protocol == htons(ETH_P_IP));
@@ -355,14 +354,14 @@ int udpv6_recvmsg(struct kiocb *iocb, struct sock *sk, 
	 * coverage checksum (UDP-Lite), do it before the copy.

	 */



	if (copied < ulen || UDP_SKB_CB(skb)->partial_cov) {

	if (len < ulen || UDP_SKB_CB(skb)->partial_cov) {

		if (udp_lib_checksum_complete(skb))

			goto csum_copy_err;

	}



	if (skb_csum_unnecessary(skb))

		err = skb_copy_datagram_iovec(skb, sizeof(struct udphdr),

					      msg->msg_iov, copied       );

					      msg->msg_iov,len);

	else {

		err = skb_copy_and_csum_datagram_iovec(skb, sizeof(struct udphdr), msg->msg_iov);

		if (err == -EINVAL)
@@ -411,7 +410,7 @@ int udpv6_recvmsg(struct kiocb *iocb, struct sock *sk, 
			datagram_recv_ctl(sk, msg, skb);

	}



	err = copied;

	err = len;

	if (flags & MSG_TRUNC)

		err = ulen;