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

[NET]: Annotate __skb_checksum_complete() and friends. 



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

include/linux/netfilter.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -290,7 +290,7 @@ extern u_int16_t nf_proto_csum_update(struct sk_buff *skb, 




struct nf_afinfo {

struct nf_afinfo {

	unsigned short	family;

	unsigned short	family;

	unsigned int	(*checksum)(struct sk_buff *skb, unsigned int hook,

	__sum16		(*checksum)(struct sk_buff *skb, unsigned int hook,

				    unsigned int dataoff, u_int8_t protocol);

				    unsigned int dataoff, u_int8_t protocol);

	void		(*saveroute)(const struct sk_buff *skb,

	void		(*saveroute)(const struct sk_buff *skb,

				     struct nf_info *info);

				     struct nf_info *info);
@@ -305,12 +305,12 @@ static inline struct nf_afinfo *nf_get_afinfo(unsigned short family) 
	return rcu_dereference(nf_afinfo[family]);

	return rcu_dereference(nf_afinfo[family]);

}

}





static inline unsigned int

static inline __sum16

nf_checksum(struct sk_buff *skb, unsigned int hook, unsigned int dataoff,

nf_checksum(struct sk_buff *skb, unsigned int hook, unsigned int dataoff,

	    u_int8_t protocol, unsigned short family)

	    u_int8_t protocol, unsigned short family)

{

{

	struct nf_afinfo *afinfo;

	struct nf_afinfo *afinfo;

	unsigned int csum = 0;

	__sum16 csum = 0;





	rcu_read_lock();

	rcu_read_lock();

	afinfo = nf_get_afinfo(family);

	afinfo = nf_get_afinfo(family);

include/linux/netfilter_ipv4.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -79,7 +79,7 @@ enum nf_ip_hook_priorities { 
#ifdef __KERNEL__

#ifdef __KERNEL__

extern int ip_route_me_harder(struct sk_buff **pskb, unsigned addr_type);

extern int ip_route_me_harder(struct sk_buff **pskb, unsigned addr_type);

extern int ip_xfrm_me_harder(struct sk_buff **pskb);

extern int ip_xfrm_me_harder(struct sk_buff **pskb);

extern unsigned int nf_ip_checksum(struct sk_buff *skb, unsigned int hook,

extern __sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook,

				   unsigned int dataoff, u_int8_t protocol);

				   unsigned int dataoff, u_int8_t protocol);

#endif /*__KERNEL__*/

#endif /*__KERNEL__*/

include/linux/netfilter_ipv6.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -74,7 +74,7 @@ enum nf_ip6_hook_priorities { 




#ifdef CONFIG_NETFILTER

#ifdef CONFIG_NETFILTER

extern int ip6_route_me_harder(struct sk_buff *skb);

extern int ip6_route_me_harder(struct sk_buff *skb);

extern unsigned int nf_ip6_checksum(struct sk_buff *skb, unsigned int hook,

extern __sum16 nf_ip6_checksum(struct sk_buff *skb, unsigned int hook,

				    unsigned int dataoff, u_int8_t protocol);

				    unsigned int dataoff, u_int8_t protocol);





extern int ipv6_netfilter_init(void);

extern int ipv6_netfilter_init(void);

include/linux/skbuff.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -1398,7 +1398,7 @@ static inline void skb_set_timestamp(struct sk_buff *skb, const struct timeval * 




extern void __net_timestamp(struct sk_buff *skb);

extern void __net_timestamp(struct sk_buff *skb);





extern unsigned int __skb_checksum_complete(struct sk_buff *skb);

extern __sum16 __skb_checksum_complete(struct sk_buff *skb);





/**

/**

 *	skb_checksum_complete - Calculate checksum of an entire packet

 *	skb_checksum_complete - Calculate checksum of an entire packet

include/net/tcp.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -814,7 +814,7 @@ static inline __sum16 tcp_v4_check(struct tcphdr *th, int len, 
	return csum_tcpudp_magic(saddr,daddr,len,IPPROTO_TCP,base);

	return csum_tcpudp_magic(saddr,daddr,len,IPPROTO_TCP,base);

}

}





static inline int __tcp_checksum_complete(struct sk_buff *skb)

static inline __sum16 __tcp_checksum_complete(struct sk_buff *skb)

{

{

	return __skb_checksum_complete(skb);

	return __skb_checksum_complete(skb);

}

}