netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v3 1/2] flow_dissector: clean up IPIP case
@ 2013-07-29 18:07 Tom Herbert
  2013-07-31  2:17 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Tom Herbert @ 2013-07-29 18:07 UTC (permalink / raw)
  To: davem; +Cc: netdev

Explicitly set proto to ETH_P_IP and jump directly to ip processing.

Signed-off-by: Tom Herbert <therbert@google.com>
---
 net/core/flow_dissector.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index 00ee068..3259446 100644
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -139,7 +139,8 @@ ipv6:
 		break;
 	}
 	case IPPROTO_IPIP:
-		goto again;
+		proto = htons(ETH_P_IP);
+		goto ip;
 	default:
 		break;
 	}
-- 
1.8.3

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

* Re: [PATCH v3 1/2] flow_dissector: clean up IPIP case
  2013-07-29 18:07 [PATCH v3 1/2] flow_dissector: clean up IPIP case Tom Herbert
@ 2013-07-31  2:17 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2013-07-31  2:17 UTC (permalink / raw)
  To: therbert; +Cc: netdev

From: Tom Herbert <therbert@google.com>
Date: Mon, 29 Jul 2013 11:07:36 -0700 (PDT)

> Explicitly set proto to ETH_P_IP and jump directly to ip processing.
> 
> Signed-off-by: Tom Herbert <therbert@google.com>

Applied.

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

end of thread, other threads:[~2013-07-31  2:17 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-29 18:07 [PATCH v3 1/2] flow_dissector: clean up IPIP case Tom Herbert
2013-07-31  2:17 ` 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).