[NET]: Annotate __skb_checksum_complete() and friends.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -290,7 +290,7 @@ extern u_int16_t nf_proto_csum_update(struct sk_buff *skb,
|
||||
|
||||
struct nf_afinfo {
|
||||
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);
|
||||
void (*saveroute)(const struct sk_buff *skb,
|
||||
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]);
|
||||
}
|
||||
|
||||
static inline unsigned int
|
||||
static inline __sum16
|
||||
nf_checksum(struct sk_buff *skb, unsigned int hook, unsigned int dataoff,
|
||||
u_int8_t protocol, unsigned short family)
|
||||
{
|
||||
struct nf_afinfo *afinfo;
|
||||
unsigned int csum = 0;
|
||||
__sum16 csum = 0;
|
||||
|
||||
rcu_read_lock();
|
||||
afinfo = nf_get_afinfo(family);
|
||||
|
||||
@@ -79,7 +79,7 @@ enum nf_ip_hook_priorities {
|
||||
#ifdef __KERNEL__
|
||||
extern int ip_route_me_harder(struct sk_buff **pskb, unsigned addr_type);
|
||||
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);
|
||||
#endif /*__KERNEL__*/
|
||||
|
||||
|
||||
@@ -74,7 +74,7 @@ enum nf_ip6_hook_priorities {
|
||||
|
||||
#ifdef CONFIG_NETFILTER
|
||||
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);
|
||||
|
||||
extern int ipv6_netfilter_init(void);
|
||||
|
||||
@@ -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 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
|
||||
|
||||
+1
-1
@@ -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);
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
+4
-4
@@ -69,15 +69,15 @@ struct sk_buff;
|
||||
/*
|
||||
* Generic checksumming routines for UDP(-Lite) v4 and v6
|
||||
*/
|
||||
static inline u16 __udp_lib_checksum_complete(struct sk_buff *skb)
|
||||
static inline __sum16 __udp_lib_checksum_complete(struct sk_buff *skb)
|
||||
{
|
||||
if (! UDP_SKB_CB(skb)->partial_cov)
|
||||
return __skb_checksum_complete(skb);
|
||||
return csum_fold(skb_checksum(skb, 0, UDP_SKB_CB(skb)->cscov,
|
||||
skb->csum));
|
||||
return csum_fold(skb_checksum(skb, 0, UDP_SKB_CB(skb)->cscov,
|
||||
skb->csum));
|
||||
}
|
||||
|
||||
static __inline__ int udp_lib_checksum_complete(struct sk_buff *skb)
|
||||
static inline __sum16 udp_lib_checksum_complete(struct sk_buff *skb)
|
||||
{
|
||||
return skb->ip_summed != CHECKSUM_UNNECESSARY &&
|
||||
__udp_lib_checksum_complete(skb);
|
||||
|
||||
Reference in New Issue
Block a user