diff options
| author | David S. Miller <davem@davemloft.net> | 2011-11-26 14:47:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-26 14:47:03 -0500 |
| commit | 6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c (patch) | |
| tree | cd71e597bbbe677820bb229c6aedbad412758959 /net/core/skbuff.c | |
| parent | d6f03f29f7cdf064289f941bf0b838348e996e65 (diff) | |
| parent | fc0b927d9a5024e138c4318fe19a590f23e3eeec (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/ipv4/inet_diag.c
Diffstat (limited to 'net/core/skbuff.c')
| -rw-r--r-- | net/core/skbuff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 7dc05ecf040a..678ae4e783aa 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
| @@ -2279,7 +2279,7 @@ static int skb_prepare_for_shift(struct sk_buff *skb) | |||
| 2279 | * @shiftlen: shift up to this many bytes | 2279 | * @shiftlen: shift up to this many bytes |
| 2280 | * | 2280 | * |
| 2281 | * Attempts to shift up to shiftlen worth of bytes, which may be less than | 2281 | * Attempts to shift up to shiftlen worth of bytes, which may be less than |
| 2282 | * the length of the skb, from tgt to skb. Returns number bytes shifted. | 2282 | * the length of the skb, from skb to tgt. Returns number bytes shifted. |
| 2283 | * It's up to caller to free skb if everything was shifted. | 2283 | * It's up to caller to free skb if everything was shifted. |
| 2284 | * | 2284 | * |
| 2285 | * If @tgt runs out of frags, the whole operation is aborted. | 2285 | * If @tgt runs out of frags, the whole operation is aborted. |