diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-26 19:04:29 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-26 19:04:29 -0400 |
| commit | fc915c8b930c3114f2a838f7e2cd8789ad6fedc3 (patch) | |
| tree | 795197f8ec2bc5ba42ee975ecd4d5a16c64e063c /net/core/skbuff.c | |
| parent | fe89def79c48e2149abdd1e816523e69a9067191 (diff) | |
| parent | 6b16351acbd415e66ba16bf7d473ece1574cf0bc (diff) | |
Merge 3.5-rc4 into tty-next
This is to pick up the serial port and tty changes in Linus's tree to allow
everyone to sync up.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 016694d62484..d78671e9d545 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
| @@ -3361,7 +3361,7 @@ EXPORT_SYMBOL(kfree_skb_partial); | |||
| 3361 | * @to: prior buffer | 3361 | * @to: prior buffer |
| 3362 | * @from: buffer to add | 3362 | * @from: buffer to add |
| 3363 | * @fragstolen: pointer to boolean | 3363 | * @fragstolen: pointer to boolean |
| 3364 | * | 3364 | * @delta_truesize: how much more was allocated than was requested |
| 3365 | */ | 3365 | */ |
| 3366 | bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from, | 3366 | bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from, |
| 3367 | bool *fragstolen, int *delta_truesize) | 3367 | bool *fragstolen, int *delta_truesize) |