Re: [PATCH net-next] net: rds: Change PF_INET to AF_INET

[Jakub Kicinski]

On Wed, 16 Dec 2020 15:06:20 +0800 Zheng Yongjun wrote:
> By bsd codestyle, change PF_INET to AF_INET.
> 
> Signed-off-by: Zheng Yongjun 

# Form letter - net-next is closed

We have already sent the networking pull request for 5.11 and therefore
net-next is closed for new drivers, features, code refactoring and
optimizations. We are currently accepting bug fixes only.

Please repost when net-next reopens after 5.11-rc1 is cut.

Look out for the announcement on the mailing list or check:
http://vger.kernel.org/~davem/net-next.html

RFC patches sent for review only are obviously welcome at any time.

[PATCH net-next] net: rds: Change PF_INET to AF_INET

[Zheng Yongjun]

By bsd codestyle, change PF_INET to AF_INET.

Signed-off-by: Zheng Yongjun 
---
 net/rds/rdma_transport.c | 4 ++--
 net/rds/tcp_listen.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net/rds/rdma_transport.c b/net/rds/rdma_transport.c
index 5f741e51b4ba..04102dbc04d2 100644
--- a/net/rds/rdma_transport.c
+++ b/net/rds/rdma_transport.c
@@ -249,7 +249,7 @@ static int rds_rdma_listen_init(void)
 #endif
struct sockaddr_in sin;
 
-   sin.sin_family = PF_INET;
+   sin.sin_family = AF_INET;
sin.sin_addr.s_addr = htonl(INADDR_ANY);
sin.sin_port = htons(RDS_PORT);
ret = rds_rdma_listen_init_common(rds_rdma_cm_event_handler,
@@ -259,7 +259,7 @@ static int rds_rdma_listen_init(void)
return ret;
 
 #if IS_ENABLED(CONFIG_IPV6)
-   sin6.sin6_family = PF_INET6;
+   sin6.sin6_family = AF_INET6;
sin6.sin6_addr = in6addr_any;
sin6.sin6_port = htons(RDS_CM_PORT);
sin6.sin6_scope_id = 0;
diff --git a/net/rds/tcp_listen.c b/net/rds/tcp_listen.c
index 101cf14215a0..8dc71aee4691 100644
--- a/net/rds/tcp_listen.c
+++ b/net/rds/tcp_listen.c
@@ -281,7 +281,7 @@ struct socket *rds_tcp_listen_init(struct net *net, bool 
isv6)
 
if (isv6) {
sin6 = (struct sockaddr_in6 *)
-   sin6->sin6_family = PF_INET6;
+   sin6->sin6_family = AF_INET6;
sin6->sin6_addr = in6addr_any;
sin6->sin6_port = (__force u16)htons(RDS_TCP_PORT);
sin6->sin6_scope_id = 0;
@@ -289,7 +289,7 @@ struct socket *rds_tcp_listen_init(struct net *net, bool 
isv6)
addr_len = sizeof(*sin6);
} else {
sin = (struct sockaddr_in *)
-   sin->sin_family = PF_INET;
+   sin->sin_family = AF_INET;
sin->sin_addr.s_addr = INADDR_ANY;
sin->sin_port = (__force u16)htons(RDS_TCP_PORT);
addr_len = sizeof(*sin);
-- 
2.22.0