Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[linux-2.6-omap-h63xx.git] / net / ipv4 / ip_sockglue.c

diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 624b534201e2633a79519f8a8980a7130a356ac8..43c05854d752f94c88dbb3dbd4ab43a111a93d0d 100644 (file)
--- 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;