[NET]: Fix assorted misannotations (from md5 and udplite merges).

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/tcp.h b/include/net/tcp.h
index aa7989c53791c1019ffdee26de0d01193670f6b0..c99774f15eba92d76a43a6a76eae5773be6224a8 100644 (file)
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1154,7 +1154,7 @@ extern int                        tcp_v4_md5_do_add(struct sock *sk,
                                                  u8 newkeylen);
 
 extern int                     tcp_v4_md5_do_del(struct sock *sk,
-                                                 u32 addr);
+                                                 __be32 addr);
 
 extern struct tcp_md5sig_pool  **tcp_alloc_md5sig_pool(void);
 extern void                    tcp_free_md5sig_pool(void);

diff --git a/include/net/udp.h b/include/net/udp.h
index c5ccd9a3387bda6e08a72152780a81592ebdf45b..eac69ff0582c5df8e28f5894f0bc51b691beb589 100644 (file)
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -77,7 +77,7 @@ static inline __sum16 __udp_lib_checksum_complete(struct sk_buff *skb)
                                      skb->csum));
 }
 
-static inline __sum16 udp_lib_checksum_complete(struct sk_buff *skb)
+static inline int udp_lib_checksum_complete(struct sk_buff *skb)
 {
        return skb->ip_summed != CHECKSUM_UNNECESSARY &&
                __udp_lib_checksum_complete(skb);

diff --git a/include/net/udplite.h b/include/net/udplite.h
index 3abaab7b78c6802caab9650fbc8d951f3befd8a8..67ac5142430735422560e78b46fe495031edad33 100644 (file)
--- a/include/net/udplite.h
+++ b/include/net/udplite.h
@@ -90,9 +90,9 @@ static __inline__ int udplite6_csum_init(struct sk_buff *skb, struct udphdr *uh)
        int rc = udplite_checksum_init(skb, uh);
 
        if (!rc)
-               skb->csum = ~csum_ipv6_magic(&skb->nh.ipv6h->saddr,
+               skb->csum = ~csum_unfold(csum_ipv6_magic(&skb->nh.ipv6h->saddr,
                                             &skb->nh.ipv6h->daddr,
-                                            skb->len, IPPROTO_UDPLITE, 0);
+                                            skb->len, IPPROTO_UDPLITE, 0));
        return rc;
 }
 

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index b7d5522092ebeb976aa9a0a9fa57dd1022970c84..e9d467124c4d138ea1861a086bb73728a6989a8e 100644 (file)
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1020,7 +1020,7 @@ static int tcp_v4_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key,
 #ifdef CONFIG_TCP_MD5SIG_DEBUG
        int i;
 #endif
-       __u16 old_checksum;
+       __sum16 old_checksum;
        struct tcp_md5sig_pool *hp;
        struct tcp4_pseudohdr *bp;
        struct hash_desc *desc;

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 7eb76fbf1b4bf0ca4561f63f5585c43e6ce12f6d..28e4cf662ce050896f4e5528216412eb98a8b6c0 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -114,7 +114,7 @@ DEFINE_RWLOCK(udp_hash_lock);
 
 static int udp_port_rover;
 
-static inline int __udp_lib_lport_inuse(__be16 num, struct hlist_head udptable[])
+static inline int __udp_lib_lport_inuse(__u16 num, struct hlist_head udptable[])
 {
        struct sock *sk;
        struct hlist_node *node;
@@ -455,7 +455,7 @@ static int udp_push_pending_frames(struct sock *sk, struct udp_sock *up)
        struct sk_buff *skb;
        struct udphdr *uh;
        int err = 0;
-       u32 csum = 0;
+       __wsum csum = 0;
 
        /* Grab the skbuff where UDP header space exists. */
        if ((skb = skb_peek(&sk->sk_write_queue)) == NULL)

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index d2170da77e5ba1b1f5294620309368bc801b1d33..0adb337c4b7e4ca196d749790126f828d1a9663c 100644 (file)
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -739,7 +739,7 @@ static int tcp_v6_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key,
        struct scatterlist sg[4];
        __u16 data_len;
        int block = 0;
-       __u16 cksum;
+       __sum16 cksum;
        struct tcp_md5sig_pool *hp;
        struct tcp6_pseudohdr *bp;
        struct hash_desc *desc;
@@ -1032,7 +1032,7 @@ static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb)
 
 #ifdef CONFIG_TCP_MD5SIG
        if (key) {
-               u32 *opt = (u32*)(t1 + 1);
+               __be32 *opt = (__be32*)(t1 + 1);
                opt[0] = htonl((TCPOPT_NOP << 24) |
                               (TCPOPT_NOP << 16) |
                               (TCPOPT_MD5SIG << 8) |

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index efa8950ddd3009905b615665cea51712393057ac..b3ea8af50a9bc7ffe8885924c6ab9967a79acb4f 100644 (file)
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -248,7 +248,7 @@ out:
 
 static __inline__ void udpv6_err(struct sk_buff *skb,
                                 struct inet6_skb_parm *opt, int type,
-                                int code, int offset, __u32 info     )
+                                int code, int offset, __be32 info     )
 {
        return __udp6_lib_err(skb, opt, type, code, offset, info, udp_hash);
 }

diff --git a/net/ipv6/udplite.c b/net/ipv6/udplite.c
index e0ec5e63004a22bc594af047c71abbe00add5c27..d4cafacc235b795c946053e2c03812378eab92b2 100644 (file)
--- a/net/ipv6/udplite.c
+++ b/net/ipv6/udplite.c
@@ -24,7 +24,7 @@ static __inline__ int udplitev6_rcv(struct sk_buff **pskb)
 
 static __inline__ void udplitev6_err(struct sk_buff *skb,
                                     struct inet6_skb_parm *opt,
-                                    int type, int code, int offset, __u32 info)
+                                    int type, int code, int offset, __be32 info)
 {
        return __udp6_lib_err(skb, opt, type, code, offset, info, udplite_hash);
 }