diff --git a/[refs] b/[refs] index 0aa89b87b6e8..e5e184e7a33c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8fb4e1399137dbbf7f1071bc723b5eff8ad46d1a +refs/heads/master: 22019b17821ab3543090827491e465c5816cbcd6 diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c index 2beda824636e..27002dffe7ed 100644 --- a/trunk/net/core/skbuff.c +++ b/trunk/net/core/skbuff.c @@ -1369,8 +1369,21 @@ unsigned char *__pskb_pull_tail(struct sk_buff *skb, int delta) } EXPORT_SYMBOL(__pskb_pull_tail); -/* Copy some data bits from skb to kernel buffer. */ - +/** + * skb_copy_bits - copy bits from skb to kernel buffer + * @skb: source skb + * @offset: offset in source + * @to: destination buffer + * @len: number of bytes to copy + * + * Copy the specified number of bytes from the source skb to the + * destination buffer. + * + * CAUTION ! : + * If its prototype is ever changed, + * check arch/{*}/net/{*}.S files, + * since it is called from BPF assembly code. + */ int skb_copy_bits(const struct sk_buff *skb, int offset, void *to, int len) { int start = skb_headlen(skb);