summaryrefslogtreecommitdiffstats
path: root/net/ipv4/udp.c
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/ipv4/udp.c
parent34bcca28335977e969338c98c6c43a1e08f592b2 (diff)
downloadblackbird-op-linux-8e5200f54062b8af0ed1d186ea0f113854786d89.tar.gz
blackbird-op-linux-8e5200f54062b8af0ed1d186ea0f113854786d89.zip
[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/ipv4/udp.c')
-rw-r--r--net/ipv4/udp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 7eb76fbf1b4b..28e4cf662ce0 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)
OpenPOWER on IntegriCloud