Commit 8e5200f5 authored by Al Viro's avatar Al Viro Committed by David S. Miller
Browse files

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



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 34bcca28

include/net/tcp.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

include/net/udp.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

include/net/udplite.h

+2 −2
Original line number Diff line number Diff line
@@ -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;

}

net/ipv4/tcp_ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

net/ipv4/udp.c

+2 −2
Original line number Diff line number Diff line
@@ -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)