From: William Blough Date: Sun, 12 Feb 2017 10:05:31 +0000 (-0500) Subject: staging: lustre: lnet: fix type warning in lib-socket.c X-Git-Tag: v4.11-rc1~116^2~90 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdefc236ef23193e7dcb8758685af9e60e8820bb;p=thirdparty%2Fkernel%2Flinux.git staging: lustre: lnet: fix type warning in lib-socket.c The local socket address is defined as a __be32 value. However, if the local ip address is not given, then the constant INADDR_ANY is used. This patch converts INADDR_ANY to __be32 for type consistency. Fixes the following sparse warnings: drivers/staging/lustre/lnet/lnet/lib-socket.c:396:41: warning: incorrect type in assignment (different base types) drivers/staging/lustre/lnet/lnet/lib-socket.c:397:56: warning: restricted __be32 degrades to integer Signed-off-by: William Blough Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/lustre/lnet/lnet/lib-socket.c b/drivers/staging/lustre/lnet/lnet/lib-socket.c index 654a7b2621884..b7b87ecefcdfc 100644 --- a/drivers/staging/lustre/lnet/lnet/lib-socket.c +++ b/drivers/staging/lustre/lnet/lnet/lib-socket.c @@ -393,8 +393,10 @@ lnet_sock_create(struct socket **sockp, int *fatal, __u32 local_ip, memset(&locaddr, 0, sizeof(locaddr)); locaddr.sin_family = AF_INET; locaddr.sin_port = htons(local_port); - locaddr.sin_addr.s_addr = !local_ip ? - INADDR_ANY : htonl(local_ip); + if (!local_ip) + locaddr.sin_addr.s_addr = htonl(INADDR_ANY); + else + locaddr.sin_addr.s_addr = htonl(local_ip); rc = kernel_bind(sock, (struct sockaddr *)&locaddr, sizeof(locaddr));