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

Commit 4e64b1ed authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

net/ipv6: Convert icmpv6_push_pending_frames to void 



commit cc71b7b0 ("net/ipv6: remove unused err variable on
icmpv6_push_pending_frames") exposed icmpv6_push_pending_frames
return value not being used.

Remove now unnecessary int err declarations and uses.

Miscellanea:

o Remove unnecessary goto and out: labels
o Realign arguments

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cc71b7b0

include/net/ipv6.h

+2 −2
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ static inline void fl6_sock_release(struct ip6_flowlabel *fl) 


void icmpv6_notify(struct sk_buff *skb, u8 type, u8 code, __be32 info);



int icmpv6_push_pending_frames(struct sock *sk, struct flowi6 *fl6,

void icmpv6_push_pending_frames(struct sock *sk, struct flowi6 *fl6,

				struct icmp6hdr *thdr, int len);



int ip6_ra_control(struct sock *sk, int sel);

net/ipv6/icmp.c

+18 −25
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static bool opt_unrec(struct sk_buff *skb, __u32 offset) 
	return (*op & 0xC0) == 0x80;

}



int icmpv6_push_pending_frames(struct sock *sk, struct flowi6 *fl6,

void icmpv6_push_pending_frames(struct sock *sk, struct flowi6 *fl6,

				struct icmp6hdr *thdr, int len)

{

	struct sk_buff *skb;
@@ -258,7 +258,7 @@ int icmpv6_push_pending_frames(struct sock *sk, struct flowi6 *fl6, 


	skb = skb_peek(&sk->sk_write_queue);

	if (!skb)

		goto out;

		return;



	icmp6h = icmp6_hdr(skb);

	memcpy(icmp6h, thdr, sizeof(struct icmp6hdr));
@@ -286,8 +286,6 @@ int icmpv6_push_pending_frames(struct sock *sk, struct flowi6 *fl6, 
						      tmp_csum);

	}

	ip6_push_pending_frames(sk);

out:

	return 0;

}



struct icmpv6_msg {
@@ -437,7 +435,6 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info, 
	int iif = 0;

	int addr_type = 0;

	int len;

	int err = 0;

	u32 mark = IP6_REPLY_MARK(net, skb->mark);



	if ((u8 *)hdr < skb->head ||
@@ -574,16 +571,15 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info, 
	rcu_read_lock();

	idev = __in6_dev_get(skb->dev);



	err = ip6_append_data(sk, icmpv6_getfrag, &msg,

	if (ip6_append_data(sk, icmpv6_getfrag, &msg,

			    len + sizeof(struct icmp6hdr),

			    sizeof(struct icmp6hdr),

			    &ipc6, &fl6, (struct rt6_info *)dst,

			      MSG_DONTWAIT, &sockc_unused);

	if (err) {

			    MSG_DONTWAIT, &sockc_unused)) {

		ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTERRORS);

		ip6_flush_pending_frames(sk);

	} else {

		err = icmpv6_push_pending_frames(sk, &fl6, &tmp_hdr,

		icmpv6_push_pending_frames(sk, &fl6, &tmp_hdr,

					   len + sizeof(struct icmp6hdr));

	}

	rcu_read_unlock();
@@ -681,7 +677,6 @@ static void icmpv6_echo_reply(struct sk_buff *skb) 
	struct icmpv6_msg msg;

	struct dst_entry *dst;

	struct ipcm6_cookie ipc6;

	int err = 0;

	u32 mark = IP6_REPLY_MARK(net, skb->mark);

	struct sockcm_cookie sockc_unused = {0};
@@ -718,8 +713,7 @@ static void icmpv6_echo_reply(struct sk_buff *skb) 
	else if (!fl6.flowi6_oif)

		fl6.flowi6_oif = np->ucast_oif;



	err = ip6_dst_lookup(net, sk, &dst, &fl6);

	if (err)

	if (ip6_dst_lookup(net, sk, &dst, &fl6))

		goto out;

	dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), sk, 0);

	if (IS_ERR(dst))
@@ -736,16 +730,15 @@ static void icmpv6_echo_reply(struct sk_buff *skb) 
	ipc6.dontfrag = np->dontfrag;

	ipc6.opt = NULL;



	err = ip6_append_data(sk, icmpv6_getfrag, &msg, skb->len + sizeof(struct icmp6hdr),

	if (ip6_append_data(sk, icmpv6_getfrag, &msg,

			    skb->len + sizeof(struct icmp6hdr),

			    sizeof(struct icmp6hdr), &ipc6, &fl6,

			    (struct rt6_info *)dst, MSG_DONTWAIT,

				&sockc_unused);



	if (err) {

			    &sockc_unused)) {

		__ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTERRORS);

		ip6_flush_pending_frames(sk);

	} else {

		err = icmpv6_push_pending_frames(sk, &fl6, &tmp_hdr,

		icmpv6_push_pending_frames(sk, &fl6, &tmp_hdr,

					   skb->len + sizeof(struct icmp6hdr));

	}

	dst_release(dst);

net/ipv6/ping.c

+2 −3
Original line number Diff line number Diff line
@@ -154,9 +154,8 @@ static int ping_v6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 
				ICMP6_MIB_OUTERRORS);

		ip6_flush_pending_frames(sk);

	} else {

		err = icmpv6_push_pending_frames(sk, &fl6,

						 (struct icmp6hdr *) &pfh.icmph,

						 len);

		icmpv6_push_pending_frames(sk, &fl6,

					   (struct icmp6hdr *)&pfh.icmph, len);

	}

	release_sock(sk);