summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-11-20 18:06:37 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-02 21:27:16 -0800
commit8e5200f54062b8af0ed1d186ea0f113854786d89 (patch)
tree71e00b21ae4f8410413f70141aa275529dbbfb84 /net
parent34bcca28335977e969338c98c6c43a1e08f592b2 (diff)
downloadop-kernel-dev-8e5200f54062b8af0ed1d186ea0f113854786d89.zip
op-kernel-dev-8e5200f54062b8af0ed1d186ea0f113854786d89.tar.gz
[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>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/tcp_ipv4.c2
-rw-r--r--net/ipv4/udp.c4
-rw-r--r--net/ipv6/tcp_ipv6.c4
-rw-r--r--net/ipv6/udp.c2
-rw-r--r--net/ipv6/udplite.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index b7d5522..e9d4671 100644
--- 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 7eb76fb..28e4cf6 100644
--- 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 d2170da..0adb337 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 efa8950..b3ea8af 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 e0ec5e6..d4cafac 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);
}
OpenPOWER on IntegriCloud