inet: constify inet_sk_bound_dev_eq() net parameter

edumazet · kuba-moo · commit a2dc7bee4f77 · 2024-08-05T16:22:45.000-07:00
inet_sk_bound_dev_eq() and its callers do not modify the net structure. Signed-off-by: Eric Dumazet <edumazet@google.com> Reviewed-by: Simon Horman <horms@kernel.org> Link: https://patch.msgid.link/20240802134029.3748005-2-edumazet@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
diff --git a/include/net/inet6_hashtables.h b/include/net/inet6_hashtables.h
@@ -175,7 +175,7 @@ struct sock *inet6_lookup(struct net *net, struct inet_hashinfo *hashinfo,
 
 int inet6_hash(struct sock *sk);
 
-static inline bool inet6_match(struct net *net, const struct sock *sk,
+static inline bool inet6_match(const struct net *net, const struct sock *sk,
 			       const struct in6_addr *saddr,
 			       const struct in6_addr *daddr,
 			       const __portpair ports,
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
@@ -351,7 +351,7 @@ static inline struct sock *inet_lookup_listener(struct net *net,
 				   ((__force __u64)(__be32)(__saddr)))
 #endif /* __BIG_ENDIAN */
 
-static inline bool inet_match(struct net *net, const struct sock *sk,
+static inline bool inet_match(const struct net *net, const struct sock *sk,
 			      const __addrpair cookie, const __portpair ports,
 			      int dif, int sdif)
 {
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
@@ -150,7 +150,8 @@ static inline bool inet_bound_dev_eq(bool l3mdev_accept, int bound_dev_if,
 	return bound_dev_if == dif || bound_dev_if == sdif;
 }
 
-static inline bool inet_sk_bound_dev_eq(struct net *net, int bound_dev_if,
+static inline bool inet_sk_bound_dev_eq(const struct net *net,
+					int bound_dev_if,
 					int dif, int sdif)
 {
 #if IS_ENABLED(CONFIG_NET_L3_MASTER_DEV)
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
@@ -310,7 +310,7 @@ inet_lhash2_bucket_sk(struct inet_hashinfo *h, struct sock *sk)
 	return inet_lhash2_bucket(h, hash);
 }
 
-static inline int compute_score(struct sock *sk, struct net *net,
+static inline int compute_score(struct sock *sk, const struct net *net,
 				const unsigned short hnum, const __be32 daddr,
 				const int dif, const int sdif)
 {
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c
@@ -89,7 +89,7 @@ struct sock *__inet6_lookup_established(struct net *net,
 }
 EXPORT_SYMBOL(__inet6_lookup_established);
 
-static inline int compute_score(struct sock *sk, struct net *net,
+static inline int compute_score(struct sock *sk, const struct net *net,
 				const unsigned short hnum,
 				const struct in6_addr *daddr,
 				const int dif, const int sdif)

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ static inline struct sock inet_lookup_listener(struct net net,`
`351`	`351`	`((__force __u64)(__be32)(__saddr)))`
`352`	`352`	`#endif /* __BIG_ENDIAN */`
`353`	`353`
`354`		`-static inline bool inet_match(struct net net, const struct sock sk,`
	`354`	`+static inline bool inet_match(const struct net net, const struct sock sk,`
`355`	`355`	`const __addrpair cookie, const __portpair ports,`
`356`	`356`	`int dif, int sdif)`
`357`	`357`	`{`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,8 @@ static inline bool inet_bound_dev_eq(bool l3mdev_accept, int bound_dev_if,`
`150`	`150`	`return bound_dev_if == dif \|\| bound_dev_if == sdif;`
`151`	`151`	`}`
`152`	`152`
`153`		`-static inline bool inet_sk_bound_dev_eq(struct net *net, int bound_dev_if,`
	`153`	`+static inline bool inet_sk_bound_dev_eq(const struct net *net,`
	`154`	`+ int bound_dev_if,`
`154`	`155`	`int dif, int sdif)`
`155`	`156`	`{`
`156`	`157`	`#if IS_ENABLED(CONFIG_NET_L3_MASTER_DEV)`
Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ inet_lhash2_bucket_sk(struct inet_hashinfo h, struct sock sk)`
`310`	`310`	`return inet_lhash2_bucket(h, hash);`
`311`	`311`	`}`
`312`	`312`
`313`		`-static inline int compute_score(struct sock sk, struct net net,`
	`313`	`+static inline int compute_score(struct sock sk, const struct net net,`
`314`	`314`	`const unsigned short hnum, const __be32 daddr,`
`315`	`315`	`const int dif, const int sdif)`
`316`	`316`	`{`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ struct sock __inet6_lookup_established(struct net net,`
`89`	`89`	`}`
`90`	`90`	`EXPORT_SYMBOL(__inet6_lookup_established);`
`91`	`91`
`92`		`-static inline int compute_score(struct sock sk, struct net net,`
	`92`	`+static inline int compute_score(struct sock sk, const struct net net,`
`93`	`93`	`const unsigned short hnum,`
`94`	`94`	`const struct in6_addr *daddr,`
`95`	`95`	`const int dif, const int sdif)`