Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[NET]: Annotate skb_copy_and_csum_bits() and callers. 



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

include/linux/skbuff.h

+2 −2
Original line number Diff line number Diff line
@@ -1340,9 +1340,9 @@ extern int skb_copy_bits(const struct sk_buff *skb, int offset, 
				     void *to, int len);

extern int	       skb_store_bits(const struct sk_buff *skb, int offset,

				      void *from, int len);

extern unsigned int    skb_copy_and_csum_bits(const struct sk_buff *skb,

extern __wsum	       skb_copy_and_csum_bits(const struct sk_buff *skb,

					      int offset, u8 *to, int len,

					      unsigned int csum);

					      __wsum csum);

extern void	       skb_copy_and_csum_dev(const struct sk_buff *skb, u8 *to);

extern void	       skb_split(struct sk_buff *skb,

				 struct sk_buff *skb1, const u32 len);

net/core/skbuff.c

+3 −3
Original line number Diff line number Diff line
@@ -1315,8 +1315,8 @@ __wsum skb_checksum(const struct sk_buff *skb, int offset, 


/* Both of above in one bottle. */



unsigned int skb_copy_and_csum_bits(const struct sk_buff *skb, int offset,

				    u8 *to, int len, unsigned int csum)

__wsum skb_copy_and_csum_bits(const struct sk_buff *skb, int offset,

				    u8 *to, int len, __wsum csum)

{

	int start = skb_headlen(skb);

	int i, copy = start - offset;
@@ -1368,7 +1368,7 @@ unsigned int skb_copy_and_csum_bits(const struct sk_buff *skb, int offset, 
		struct sk_buff *list = skb_shinfo(skb)->frag_list;



		for (; list; list = list->next) {

			unsigned int csum2;

			__wsum csum2;

			int end;



			BUG_TRAP(start <= offset + len);