lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse Source 
Conflicts:
	net/ipv4/inet_diag.c
This commit is contained in:
David S. Miller
2011-11-26 14:47:03 -05:00
parent d6f03f29f7 fc0b927d9a
commit 6dec4ac4ee
42 changed files with 162 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/core/skbuff.c
View File

@@ -2279,7 +2279,7 @@ static int skb_prepare_for_shift(struct sk_buff *skb)
* @shiftlen: shift up to this many bytes
*
* Attempts to shift up to shiftlen worth of bytes, which may be less than
* the length of the skb, from tgt to skb. Returns number bytes shifted.
* the length of the skb, from skb to tgt. Returns number bytes shifted.
* It's up to caller to free skb if everything was shifted.
*
* If @tgt runs out of frags, the whole operation is aborted.