Re: [PATCH] net: ipv4: remove unused arg exact_dif in compute_score

2020-08-30 Thread linmiaohe
David Ahern  wrote:
>On 8/29/20 3:01 AM, Miaohe Lin wrote:
>> @@ -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);
>
>inet_exact_dif_match is no longer needed after the above is removed.

Oh, I missed it. Will remove inet_exact_dif_match() in v2. Many thanks for 
review and reply.



Re: [PATCH] net: ipv4: remove unused arg exact_dif in compute_score

2020-08-29 Thread David Ahern
On 8/29/20 3:01 AM, Miaohe Lin wrote:
> @@ -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);

inet_exact_dif_match is no longer needed after the above is removed.


[PATCH] net: ipv4: remove unused arg exact_dif in compute_score

2020-08-29 Thread Miaohe Lin
The arg exact_dif is not used anymore, remove it.

Signed-off-by: Miaohe Lin 
---
 net/ipv4/inet_hashtables.c | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index 239e54474b65..8cbe74313f38 100644
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -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, >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);
-- 
2.19.1