]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
net: ip_sockglue.c add static, annotate ports' endianness
authorHarvey Harrison <harvey.harrison@gmail.com>
Thu, 20 Nov 2008 09:54:27 +0000 (01:54 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 20 Nov 2008 09:54:27 +0000 (01:54 -0800)
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] <noident>
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 <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ip_sockglue.c

index 624b534201e2633a79519f8a8980a7130a356ac8..43c05854d752f94c88dbb3dbd4ab43a111a93d0d 100644 (file)
@@ -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;