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

[David Ahern]

On 8/31/20 12:26 AM, Miaohe Lin wrote:
> 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: Miaohe Lin 
> ---
>  include/net/tcp.h  | 10 --
>  net/ipv4/inet_hashtables.c |  6 ++
>  2 files changed, 2 insertions(+), 14 deletions(-)
> 

Reviewed-by: David Ahern 

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

[David Miller]

From: Miaohe Lin 
Date: Mon, 31 Aug 2020 02:26:34 -0400

> 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: Miaohe Lin 

Applied to net-next.

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

[Miaohe Lin]

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: Miaohe Lin 
---
 include/net/tcp.h  | 10 --
 net/ipv4/inet_hashtables.c |  6 ++
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/include/net/tcp.h b/include/net/tcp.h
index eab6c7510b5b..0d11db6436c8 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -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)
 {
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