From patchwork Tue Nov 18 20:24:01 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harvey Harrison X-Patchwork-Id: 9482 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 84B7F474C2 for ; Wed, 19 Nov 2008 07:24:25 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752916AbYKRUYJ (ORCPT ); Tue, 18 Nov 2008 15:24:09 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752690AbYKRUYH (ORCPT ); Tue, 18 Nov 2008 15:24:07 -0500 Received: from an-out-0708.google.com ([209.85.132.250]:38086 "EHLO an-out-0708.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752391AbYKRUYG (ORCPT ); Tue, 18 Nov 2008 15:24:06 -0500 Received: by an-out-0708.google.com with SMTP id d40so1360580and.1 for ; Tue, 18 Nov 2008 12:24:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; bh=q1wADO8VxBZ+Z08QGCcqom4ulPOUSnZW+cLNqhAi6Kg=; b=wA0pQ4rQhII2Fqf48ZdDizwt+VqrVJoK00oXHziMLtykyAZY7ay/892lngvSX/imsG or3DjKyw1/vNzrB1EQyqVgGdI7v09owB7gYdEPSfAf/izbLn4gx+DVAu4oGJFg7rzYx5 aV1vuSDdfacBE0O9cga/ic8UYcuMRbL8dkYz0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; b=a8AlE4y6C5sJSJz7Zu17QsijWu+k9G0wCM1GfUoeXMmQ556mX7AkwhkuxLw4f196ke o27/k3hbgIpseiT9ChASM+ZMED++yX4v7uVIZmy6SkymEvi9SGKPFUTZkRglXcm+89Ma ipT9wlWfWw3u3WLsAetXijBQFfQNVQdA/OkGI= Received: by 10.142.88.4 with SMTP id l4mr114061wfb.117.1227039844267; Tue, 18 Nov 2008 12:24:04 -0800 (PST) Received: from ?192.168.101.80? ([24.85.64.172]) by mx.google.com with ESMTPS id 30sm4737133wfd.24.2008.11.18.12.24.03 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 18 Nov 2008 12:24:03 -0800 (PST) Subject: [PATCH] net: ip_sockglue.c add static, annotate ports' endianness From: Harvey Harrison To: David Miller Cc: linux-netdev Date: Tue, 18 Nov 2008 12:24:01 -0800 Message-Id: <1227039841.13182.1.camel@brick> Mime-Version: 1.0 X-Mailer: Evolution 2.24.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fixes sparse warnings: net/ipv4/ip_sockglue.c:146:15: warning: incorrect type in assignment (different base types) net/ipv4/ip_sockglue.c:146:15: expected restricted __be16 [assigned] [usertype] sin_port net/ipv4/ip_sockglue.c:146:15: got unsigned short [unsigned] [short] [usertype] net/ipv4/ip_sockglue.c:130:6: warning: symbol 'ip_cmsg_recv_dstaddr' was not declared. Should it be static? Signed-off-by: Harvey Harrison --- These are new warnings between next-20081117 and next-20081118 net/ipv4/ip_sockglue.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index 624b534..43c0585 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c @@ -127,11 +127,11 @@ static void ip_cmsg_recv_security(struct msghdr *msg, struct sk_buff *skb) security_release_secctx(secdata, seclen); } -void ip_cmsg_recv_dstaddr(struct msghdr *msg, struct sk_buff *skb) +static void ip_cmsg_recv_dstaddr(struct msghdr *msg, struct sk_buff *skb) { struct sockaddr_in sin; struct iphdr *iph = ip_hdr(skb); - u16 *ports = (u16 *) skb_transport_header(skb); + __be16 *ports = (__be16 *)skb_transport_header(skb); if (skb_transport_offset(skb) + 4 > skb->len) return;