Skip to content

Commit

Permalink
[NET]: Annotate __skb_checksum_complete() and friends.
Browse files Browse the repository at this point in the history 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Al Viro authored and David S. Miller committed Dec 3, 2006
1 parent b1550f2 commit b51655b
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 22 deletions.
6 changes: 3 additions & 3 deletions include/linux/netfilter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion include/linux/netfilter_ipv4.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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__*/

Expand Down
2 changes: 1 addition & 1 deletion include/linux/netfilter_ipv6.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion include/linux/skbuff.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/net/tcp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
8 changes: 4 additions & 4 deletions include/net/udp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion net/core/datagram.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset,
return -EFAULT;
}

unsigned int __skb_checksum_complete(struct sk_buff *skb)
__sum16 __skb_checksum_complete(struct sk_buff *skb)
{
__sum16 sum;

Expand Down
4 changes: 2 additions & 2 deletions net/core/netpoll.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ static void queue_process(void *p)
}
}

static int checksum_udp(struct sk_buff *skb, struct udphdr *uh,
unsigned short ulen, __be32 saddr, __be32 daddr)
static __sum16 checksum_udp(struct sk_buff *skb, struct udphdr *uh,
unsigned short ulen, __be32 saddr, __be32 daddr)
{
__wsum psum;

Expand Down
4 changes: 2 additions & 2 deletions net/ipv4/netfilter.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,11 @@ static int nf_ip_reroute(struct sk_buff **pskb, const struct nf_info *info)
return 0;
}

unsigned int nf_ip_checksum(struct sk_buff *skb, unsigned int hook,
__sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook,
unsigned int dataoff, u_int8_t protocol)
{
struct iphdr *iph = skb->nh.iph;
unsigned int csum = 0;
__sum16 csum = 0;

switch (skb->ip_summed) {
case CHECKSUM_COMPLETE:
Expand Down
4 changes: 2 additions & 2 deletions net/ipv4/tcp_input.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3790,9 +3790,9 @@ static int tcp_copy_to_iovec(struct sock *sk, struct sk_buff *skb, int hlen)
return err;
}

static int __tcp_checksum_complete_user(struct sock *sk, struct sk_buff *skb)
static __sum16 __tcp_checksum_complete_user(struct sock *sk, struct sk_buff *skb)
{
int result;
__sum16 result;

if (sock_owned_by_user(sk)) {
local_bh_enable();
Expand Down
2 changes: 1 addition & 1 deletion net/ipv4/tcp_ipv4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1544,7 +1544,7 @@ static struct sock *tcp_v4_hnd_req(struct sock *sk, struct sk_buff *skb)
return sk;
}

static int tcp_v4_checksum_init(struct sk_buff *skb)
static __sum16 tcp_v4_checksum_init(struct sk_buff *skb)
{
if (skb->ip_summed == CHECKSUM_COMPLETE) {
if (!tcp_v4_check(skb->h.th, skb->len, skb->nh.iph->saddr,
Expand Down
4 changes: 2 additions & 2 deletions net/ipv6/netfilter.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ static int nf_ip6_reroute(struct sk_buff **pskb, const struct nf_info *info)
return 0;
}

unsigned int nf_ip6_checksum(struct sk_buff *skb, unsigned int hook,
__sum16 nf_ip6_checksum(struct sk_buff *skb, unsigned int hook,
unsigned int dataoff, u_int8_t protocol)
{
struct ipv6hdr *ip6h = skb->nh.ipv6h;
unsigned int csum = 0;
__sum16 csum = 0;

switch (skb->ip_summed) {
case CHECKSUM_COMPLETE:
Expand Down
2 changes: 1 addition & 1 deletion net/ipv6/tcp_ipv6.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1527,7 +1527,7 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
return NULL;
}

static int tcp_v6_checksum_init(struct sk_buff *skb)
static __sum16 tcp_v6_checksum_init(struct sk_buff *skb)
{
if (skb->ip_summed == CHECKSUM_COMPLETE) {
if (!tcp_v6_check(skb->h.th,skb->len,&skb->nh.ipv6h->saddr,
Expand Down

0 comments on commit b51655b

Please sign in to comment.