[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>

3 files changed, 4 insertions, 4 deletions

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index d2170da77e5..0adb337c4b7 100644
--- 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 efa8950ddd3..b3ea8af50a9 100644
--- 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 e0ec5e63004..d4cafacc235 100644
--- 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);
 }