From patchwork Mon Jul 29 17:50:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 262925 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 877D52C00E4 for ; Tue, 30 Jul 2013 03:51:01 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758458Ab3G2Ru5 (ORCPT ); Mon, 29 Jul 2013 13:50:57 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:user-agent:mime-version :content-type; bh=i+QD1uIMHIEpCWNdTP/l/WS6cI0H8Wjb1eURSl6Xw+Y=; b=HJlwWC3kOp4dAcPuCRCa0Mn4C968O1GkQ/sfU/f4Obhrm5xuZUpOS3i8hHRVKTc16X JANebqhsvqWIG+bC7bq0sCGBYeik0SV8NumSJLmdep7pniaCxuR6TRmdtOROHyy/Vxat 3h0/MEiBATUZoxT4cAewsdLGrv+qoZKIkHqMl/31rE4Sq8cbLYXUQzld+DtaE4ERx3N9 mJNMKvUahswH4IjfENUAaGMcX1o1+g3TdsTI+3CEZ5WJdndCnhbMjeNePp+k95bcgQ0n nDFfOqcg1Q7+zNT+Le05hq1lEGVNYdWE0g0WBSmu/QJzxROZ1g7XQ0A4WumJQgxgyggK dtKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:user-agent:mime-version :content-type:x-gm-message-state; bh=i+QD1uIMHIEpCWNdTP/l/WS6cI0H8Wjb1eURSl6Xw+Y=; b=XN6TzV/CmeepuxrtJ4/PsehY295KZOYbDGnvQNEcv4dwpLWqxkQl3M7DXl0Ymt+Xfj R3Q4/IDwSwWp1V6pfJG9TvueePn18J8G4Zfdx/VAGn3jFtbyabjOqO8V2v/Y6BEJ9TlC OLNtcrsjlLgs/2l+7jl84nAqypq0nkWG71XqtJgizt5QDLbm8mW3ops0+gebh2uGbm+M /oVinHynB7H2bjzBTACmjM1XHKNSvQwPnqv6D7YLDRxZLwV9RU5EYuJTYnTwfFhSkpWu iCJCdbwBk4bEw50x290LLrro33vFXNmgXTwkeGM3O4FISJQBx1QS3IRI7sbjvZq+SKT3 kpYQ== X-Received: by 10.236.79.67 with SMTP id h43mr30355208yhe.46.1375120255750; Mon, 29 Jul 2013 10:50:55 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id v70si4344511yhv.3.2013.07.29.10.50.55 for (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Mon, 29 Jul 2013 10:50:55 -0700 (PDT) Received: from tomh.mtv.corp.google.com (tomh.mtv.corp.google.com [172.17.131.23]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 96F0F5A41FA; Mon, 29 Jul 2013 10:50:55 -0700 (PDT) Received: by tomh.mtv.corp.google.com (Postfix, from userid 60832) id 4883520099E; Mon, 29 Jul 2013 10:50:55 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by tomh.mtv.corp.google.com (Postfix) with ESMTP id 3BD252006E6; Mon, 29 Jul 2013 10:50:55 -0700 (PDT) Date: Mon, 29 Jul 2013 10:50:55 -0700 (PDT) From: Tom Herbert To: davem@davemloft.net cc: netdev@vger.kernel.org Subject: [PATCH 1/2] flow_dissector: clean up IPIP case Message-ID: User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQktaKMcz6Tpuxq1KOfGtrNy3f+yqT6ZNw0MUnbBy/MUvUDBWaiul+kuxe3T5L33xIlCUOajn0rfoiLACnXSqyT8nLPKCcxOtaWZbwZ7DnpfqZwOAXGT3M6+4/fz1LJrS7lJHYuXb8G4kroEP/lp3VJJHqglIsgcNbQkGEeNXmSApLOIfZOg3kvFYpk1j5PRwzV+pdVU Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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; }