diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-11-15 00:37:33 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 00:23:36 -0500 |
commit | 81d77662763ae527ba3a9b9275467901aaab7dfd (patch) | |
tree | c0280981515d052535f24ac89cbb135dc68abe55 | |
parent | 2bbbc86890ac4c911c5057f69af93853e52a42a8 (diff) |
[NET]: Annotate skb_copy_and_csum_bits() and callers.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/linux/skbuff.h | 4 | ||||
-rw-r--r-- | net/core/skbuff.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 784129fb61d4..874ca029fbb9 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
@@ -1340,9 +1340,9 @@ extern int skb_copy_bits(const struct sk_buff *skb, int offset, | |||
1340 | void *to, int len); | 1340 | void *to, int len); |
1341 | extern int skb_store_bits(const struct sk_buff *skb, int offset, | 1341 | extern int skb_store_bits(const struct sk_buff *skb, int offset, |
1342 | void *from, int len); | 1342 | void *from, int len); |
1343 | extern unsigned int skb_copy_and_csum_bits(const struct sk_buff *skb, | 1343 | extern __wsum skb_copy_and_csum_bits(const struct sk_buff *skb, |
1344 | int offset, u8 *to, int len, | 1344 | int offset, u8 *to, int len, |
1345 | unsigned int csum); | 1345 | __wsum csum); |
1346 | extern void skb_copy_and_csum_dev(const struct sk_buff *skb, u8 *to); | 1346 | extern void skb_copy_and_csum_dev(const struct sk_buff *skb, u8 *to); |
1347 | extern void skb_split(struct sk_buff *skb, | 1347 | extern void skb_split(struct sk_buff *skb, |
1348 | struct sk_buff *skb1, const u32 len); | 1348 | struct sk_buff *skb1, const u32 len); |
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index be9b541f536f..07c25d601922 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
@@ -1315,8 +1315,8 @@ __wsum skb_checksum(const struct sk_buff *skb, int offset, | |||
1315 | 1315 | ||
1316 | /* Both of above in one bottle. */ | 1316 | /* Both of above in one bottle. */ |
1317 | 1317 | ||
1318 | unsigned int skb_copy_and_csum_bits(const struct sk_buff *skb, int offset, | 1318 | __wsum skb_copy_and_csum_bits(const struct sk_buff *skb, int offset, |
1319 | u8 *to, int len, unsigned int csum) | 1319 | u8 *to, int len, __wsum csum) |
1320 | { | 1320 | { |
1321 | int start = skb_headlen(skb); | 1321 | int start = skb_headlen(skb); |
1322 | int i, copy = start - offset; | 1322 | int i, copy = start - offset; |
@@ -1368,7 +1368,7 @@ unsigned int skb_copy_and_csum_bits(const struct sk_buff *skb, int offset, | |||
1368 | struct sk_buff *list = skb_shinfo(skb)->frag_list; | 1368 | struct sk_buff *list = skb_shinfo(skb)->frag_list; |
1369 | 1369 | ||
1370 | for (; list; list = list->next) { | 1370 | for (; list; list = list->next) { |
1371 | unsigned int csum2; | 1371 | __wsum csum2; |
1372 | int end; | 1372 | int end; |
1373 | 1373 | ||
1374 | BUG_TRAP(start <= offset + len); | 1374 | BUG_TRAP(start <= offset + len); |