From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751194AbdBLKFr (ORCPT ); Sun, 12 Feb 2017 05:05:47 -0500 Received: from galois.cryonox.net ([173.255.233.171]:41872 "EHLO galois.cryonox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751111AbdBLKFq (ORCPT ); Sun, 12 Feb 2017 05:05:46 -0500 Date: Sun, 12 Feb 2017 05:05:31 -0500 From: William Blough To: Oleg Drokin , Andreas Dilger , James Simmons , Greg Kroah-Hartman Cc: lustre-devel@lists.lustre.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Message-ID: <20170212100526.GA24747@blough.us> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-SA-Exim-Connect-IP: 174.131.118.207 X-SA-Exim-Mail-From: devel@blough.us Subject: [PATCH] staging: lustre: lnet: fix type warning in lib-socket.c X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:57:07 +0000) X-SA-Exim-Scanned: Yes (on galois.cryonox.net) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/staging/lustre/lnet/lnet/lib-socket.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/staging/lustre/lnet/lnet/lib-socket.c b/drivers/staging/lustre/lnet/lnet/lib-socket.c index 654a7b2..b7b87ec 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)); -- 2.1.4