netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net-next] core: Copy inner_protocol in copy_skb_header()
@ 2013-07-03  7:04 Simon Horman
  2013-07-03 23:52 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Simon Horman @ 2013-07-03  7:04 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: Joe Stringer, Simon Horman

From: Joe Stringer <joe@wand.net.nz>

inner_protocol was added to struct sk_buff in
0d89d2035fe063461a5ddb609b2c12e7fb006e44 ("MPLS: Add limited GSO support"),
which is scheduled to be included in v3.11.

That patch did not update __copy_skb_header to copy the inner_protocol.

Signed-off-by: Joe Stringer <joe@wand.net.nz>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
 net/core/skbuff.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index b1fcb87..ee08e63 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -693,6 +693,7 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old)
 	new->transport_header	= old->transport_header;
 	new->network_header	= old->network_header;
 	new->mac_header		= old->mac_header;
+	new->inner_protocol	= old->inner_protocol;
 	new->inner_transport_header = old->inner_transport_header;
 	new->inner_network_header = old->inner_network_header;
 	new->inner_mac_header = old->inner_mac_header;
-- 
1.8.2.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH net-next] core: Copy inner_protocol in copy_skb_header()
  2013-07-03  7:04 [PATCH net-next] core: Copy inner_protocol in copy_skb_header() Simon Horman
@ 2013-07-03 23:52 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2013-07-03 23:52 UTC (permalink / raw)
  To: horms; +Cc: netdev, joe

From: Simon Horman <horms@verge.net.au>
Date: Wed,  3 Jul 2013 16:04:25 +0900

> From: Joe Stringer <joe@wand.net.nz>
> 
> inner_protocol was added to struct sk_buff in
> 0d89d2035fe063461a5ddb609b2c12e7fb006e44 ("MPLS: Add limited GSO support"),
> which is scheduled to be included in v3.11.
> 
> That patch did not update __copy_skb_header to copy the inner_protocol.
> 
> Signed-off-by: Joe Stringer <joe@wand.net.nz>
> Signed-off-by: Simon Horman <horms@verge.net.au>

Applied.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-07-03 23:52 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-03  7:04 [PATCH net-next] core: Copy inner_protocol in copy_skb_header() Simon Horman
2013-07-03 23:52 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).