Commit 73545373 authored by Tim Beale's avatar Tim Beale Committed by David S. Miller
Browse files

udp: Remove unused parameter (exact_dif) 



Originally this was used by the VRF logic in compute_score(), but that
was later replaced by udp_sk_bound_dev_eq() and the parameter became
unused.

Note this change adds an 'unused variable' compiler warning that will be
removed in the next patch (I've split the removal in two to make review
slightly easier).

Signed-off-by: default avatarTim Beale <timbeale@catalyst.net.nz>
Reviewed-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d6fb396c

net/ipv4/udp.c

+5 −5
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ int udp_v4_get_port(struct sock *sk, unsigned short snum) 
static int compute_score(struct sock *sk, struct net *net,

			 __be32 saddr, __be16 sport,

			 __be32 daddr, unsigned short hnum,

			 int dif, int sdif, bool exact_dif)

			 int dif, int sdif)

{

	int score;

	struct inet_sock *inet;
@@ -420,7 +420,7 @@ static u32 udp_ehashfn(const struct net *net, const __be32 laddr, 
static struct sock *udp4_lib_lookup2(struct net *net,

				     __be32 saddr, __be16 sport,

				     __be32 daddr, unsigned int hnum,

				     int dif, int sdif, bool exact_dif,

				     int dif, int sdif,

				     struct udp_hslot *hslot2,

				     struct sk_buff *skb)

{
@@ -432,7 +432,7 @@ static struct sock *udp4_lib_lookup2(struct net *net, 
	badness = 0;

	udp_portaddr_for_each_entry_rcu(sk, &hslot2->head) {

		score = compute_score(sk, net, saddr, sport,

				      daddr, hnum, dif, sdif, exact_dif);

				      daddr, hnum, dif, sdif);

		if (score > badness) {

			if (sk->sk_reuseport) {

				hash = udp_ehashfn(net, daddr, hnum,
@@ -468,7 +468,7 @@ struct sock *__udp4_lib_lookup(struct net *net, __be32 saddr, 


	result = udp4_lib_lookup2(net, saddr, sport,

				  daddr, hnum, dif, sdif,

				  exact_dif, hslot2, skb);

				  hslot2, skb);

	if (!result) {

		hash2 = ipv4_portaddr_hash(net, htonl(INADDR_ANY), hnum);

		slot2 = hash2 & udptable->mask;
@@ -476,7 +476,7 @@ struct sock *__udp4_lib_lookup(struct net *net, __be32 saddr, 


		result = udp4_lib_lookup2(net, saddr, sport,

					  htonl(INADDR_ANY), hnum, dif, sdif,

					  exact_dif, hslot2, skb);

					  hslot2, skb);

	}

	if (IS_ERR(result))

		return NULL;

net/ipv6/udp.c

+6 −7
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ void udp_v6_rehash(struct sock *sk) 
static int compute_score(struct sock *sk, struct net *net,

			 const struct in6_addr *saddr, __be16 sport,

			 const struct in6_addr *daddr, unsigned short hnum,

			 int dif, int sdif, bool exact_dif)

			 int dif, int sdif)

{

	int score;

	struct inet_sock *inet;
@@ -155,8 +155,8 @@ static int compute_score(struct sock *sk, struct net *net, 
static struct sock *udp6_lib_lookup2(struct net *net,

		const struct in6_addr *saddr, __be16 sport,

		const struct in6_addr *daddr, unsigned int hnum,

		int dif, int sdif, bool exact_dif,

		struct udp_hslot *hslot2, struct sk_buff *skb)

		int dif, int sdif, struct udp_hslot *hslot2,

		struct sk_buff *skb)

{

	struct sock *sk, *result;

	int score, badness;
@@ -166,7 +166,7 @@ static struct sock *udp6_lib_lookup2(struct net *net, 
	badness = -1;

	udp_portaddr_for_each_entry_rcu(sk, &hslot2->head) {

		score = compute_score(sk, net, saddr, sport,

				      daddr, hnum, dif, sdif, exact_dif);

				      daddr, hnum, dif, sdif);

		if (score > badness) {

			if (sk->sk_reuseport) {

				hash = udp6_ehashfn(net, daddr, hnum,
@@ -202,7 +202,7 @@ struct sock *__udp6_lib_lookup(struct net *net, 
	hslot2 = &udptable->hash2[slot2];



	result = udp6_lib_lookup2(net, saddr, sport,

				  daddr, hnum, dif, sdif, exact_dif,

				  daddr, hnum, dif, sdif,

				  hslot2, skb);

	if (!result) {

		hash2 = ipv6_portaddr_hash(net, &in6addr_any, hnum);
@@ -212,8 +212,7 @@ struct sock *__udp6_lib_lookup(struct net *net, 


		result = udp6_lib_lookup2(net, saddr, sport,

					  &in6addr_any, hnum, dif, sdif,

					  exact_dif, hslot2,

					  skb);

					  hslot2, skb);

	}

	if (IS_ERR(result))

		return NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE