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

Commit 725a8ff0 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

ipv6: remove unused parameter from ip6_ra_control 



Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bdccc4ca

include/net/ipv6.h

+1 −3
Original line number Diff line number Diff line
@@ -227,9 +227,7 @@ static inline void fl6_sock_release(struct ip6_flowlabel *fl) 
		atomic_dec(&fl->users);

}



extern int 			ip6_ra_control(struct sock *sk, int sel,

					       void (*destructor)(struct sock *));



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



extern int			ipv6_parse_hopopts(struct sk_buff *skb);

net/ipv6/ipv6_sockglue.c

+2 −5
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ DEFINE_SNMP_STAT(struct ipstats_mib, ipv6_statistics) __read_mostly; 
struct ip6_ra_chain *ip6_ra_chain;

DEFINE_RWLOCK(ip6_ra_lock);



int ip6_ra_control(struct sock *sk, int sel, void (*destructor)(struct sock *))

int ip6_ra_control(struct sock *sk, int sel)

{

	struct ip6_ra_chain *ra, *new_ra, **rap;
@@ -81,8 +81,6 @@ int ip6_ra_control(struct sock *sk, int sel, void (*destructor)(struct sock *)) 
			*rap = ra->next;

			write_unlock_bh(&ip6_ra_lock);



			if (ra->destructor)

				ra->destructor(sk);

			sock_put(sk);

			kfree(ra);

			return 0;
@@ -94,7 +92,6 @@ int ip6_ra_control(struct sock *sk, int sel, void (*destructor)(struct sock *)) 
	}

	new_ra->sk = sk;

	new_ra->sel = sel;

	new_ra->destructor = destructor;

	new_ra->next = ra;

	*rap = new_ra;

	sock_hold(sk);
@@ -632,7 +629,7 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, 
	case IPV6_ROUTER_ALERT:

		if (optlen < sizeof(int))

			goto e_inval;

		retv = ip6_ra_control(sk, val, NULL);

		retv = ip6_ra_control(sk, val);

		break;

	case IPV6_MTU_DISCOVER:

		if (optlen < sizeof(int))

net/ipv6/raw.c

+1 −1
Original line number Diff line number Diff line
@@ -1157,7 +1157,7 @@ static int rawv6_ioctl(struct sock *sk, int cmd, unsigned long arg) 
static void rawv6_close(struct sock *sk, long timeout)

{

	if (inet_sk(sk)->num == IPPROTO_RAW)

		ip6_ra_control(sk, -1, NULL);

		ip6_ra_control(sk, -1);

	ip6mr_sk_done(sk);

	sk_common_release(sk);

}