From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Herbert Subject: [PATCH 1/2] flow_dissector: clean up IPIP case Date: Mon, 29 Jul 2013 10:50:55 -0700 (PDT) Message-ID: Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: netdev@vger.kernel.org To: davem@davemloft.net Return-path: Received: from mail-qa0-f73.google.com ([209.85.216.73]:63323 "EHLO mail-qa0-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755763Ab3G2Ru4 (ORCPT ); Mon, 29 Jul 2013 13:50:56 -0400 Received: by mail-qa0-f73.google.com with SMTP id f14so297494qak.4 for ; Mon, 29 Jul 2013 10:50:55 -0700 (PDT) Sender: netdev-owner@vger.kernel.org List-ID: Explicitly set proto to ETH_P_IP and jump directly to ip processing. Signed-off-by: Tom Herbert --- 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