diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-06-25 01:41:54 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-06-25 01:41:54 -0400 |
commit | 98d350cf7ae077eb8083ccc7c1bfc838344ac590 (patch) | |
tree | dfee7af0eff981b941db6bdbd1d5f039f9f85407 /net/core/skbuff.c | |
parent | a10d60c08cc3bbea9195e2b36440f557373623eb (diff) | |
parent | 0bdb3ccd02509a4380d54efd85effc6a9902d4fd (diff) |
Merge branch 'perf/urgent' into perf/core, to pick up fixes and refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/core/skbuff.c')
-rw-r--r-- | net/core/skbuff.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index bf92824af3f7..9cd5344fad73 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
@@ -689,6 +689,9 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old) | |||
689 | new->ooo_okay = old->ooo_okay; | 689 | new->ooo_okay = old->ooo_okay; |
690 | new->no_fcs = old->no_fcs; | 690 | new->no_fcs = old->no_fcs; |
691 | new->encapsulation = old->encapsulation; | 691 | new->encapsulation = old->encapsulation; |
692 | new->encap_hdr_csum = old->encap_hdr_csum; | ||
693 | new->csum_valid = old->csum_valid; | ||
694 | new->csum_complete_sw = old->csum_complete_sw; | ||
692 | #ifdef CONFIG_XFRM | 695 | #ifdef CONFIG_XFRM |
693 | new->sp = secpath_get(old->sp); | 696 | new->sp = secpath_get(old->sp); |
694 | #endif | 697 | #endif |