Commit 34e1ec31 authored by Miaohe Lin's avatar Miaohe Lin Committed by David S. Miller
Browse files

net: ipv4: remove unused arg exact_dif in compute_score 



The arg exact_dif is not used anymore, remove it. inet_exact_dif_match()
is no longer needed after the above is removed, so remove it too.

Signed-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3f7d820b

include/net/tcp.h

+0 −10
Original line number Diff line number Diff line
@@ -941,16 +941,6 @@ INDIRECT_CALLABLE_DECLARE(void tcp_v6_early_demux(struct sk_buff *skb)); 


#endif



static inline bool inet_exact_dif_match(struct net *net, struct sk_buff *skb)

{

#if IS_ENABLED(CONFIG_NET_L3_MASTER_DEV)

	if (!net->ipv4.sysctl_tcp_l3mdev_accept &&

	    skb && ipv4_l3mdev_skb(IPCB(skb)->flags))

		return true;

#endif

	return false;

}



/* TCP_SKB_CB reference means this can not be used from early demux */

static inline int tcp_v4_sdif(struct sk_buff *skb)

{

net/ipv4/inet_hashtables.c

+2 −4
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ static void inet_unhash2(struct inet_hashinfo *h, struct sock *sk) 


static inline int compute_score(struct sock *sk, struct net *net,

				const unsigned short hnum, const __be32 daddr,

				const int dif, const int sdif, bool exact_dif)

				const int dif, const int sdif)

{

	int score = -1;
@@ -277,15 +277,13 @@ static struct sock *inet_lhash2_lookup(struct net *net, 
				const __be32 daddr, const unsigned short hnum,

				const int dif, const int sdif)

{

	bool exact_dif = inet_exact_dif_match(net, skb);

	struct inet_connection_sock *icsk;

	struct sock *sk, *result = NULL;

	int score, hiscore = 0;



	inet_lhash2_for_each_icsk_rcu(icsk, &ilb2->head) {

		sk = (struct sock *)icsk;

		score = compute_score(sk, net, hnum, daddr,

				      dif, sdif, exact_dif);

		score = compute_score(sk, net, hnum, daddr, dif, sdif);

		if (score > hiscore) {

			result = lookup_reuseport(net, sk, skb, doff,

						  saddr, sport, daddr, hnum);