From patchwork Mon Jan 5 06:50:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 425233 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 CF42D1400A0 for ; Mon, 5 Jan 2015 17:50:41 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753077AbbAEGug (ORCPT ); Mon, 5 Jan 2015 01:50:36 -0500 Received: from mail-pd0-f177.google.com ([209.85.192.177]:62730 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753011AbbAEGuf (ORCPT ); Mon, 5 Jan 2015 01:50:35 -0500 Received: by mail-pd0-f177.google.com with SMTP id ft15so27508966pdb.36 for ; Sun, 04 Jan 2015 22:50:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=S0/vTKXI5dXxXyL9Fi477FlO8yGonsES0Eb4xag3S6U=; b=hX2S3P3Fw1aL1WOAsrVjlhlu+cp4eHodbLa5eoaBPfOGLtv0tN5jlfmDW9UssXXCew ZWSMxXnDZdrUfikB7TbqRY0Xje5gcH3ugqJ0ZTXEgOLxszXt60e8sV5eZUWJDk9gkPcP YzhAFkzcVas0e8UicUDa+ECPBYGj9FTeaktXeGjw5b1aDC+ag5GvYvwb1sUyPei5CdsD W6pQV8cDDjJrK+iXsLKm9Zps56xvhoMULQlkPCOPevYWYLxWpqnFtebQutcuRGbDR0m1 ba5pRtY6IeZwqd1AFeDlOfivAeZKZCfpjyvVHZPQJTb4gIPD8IIYcGv0Gisy856WldyQ +e+g== X-Gm-Message-State: ALoCoQlG/zWHTV5QKiMcHlz0BKocJFYPUS8kkYpAee67uojLTvoB6rXQV1EDcnlSsYVvRMBzQKO7 X-Received: by 10.66.62.165 with SMTP id z5mr118442119par.91.1420440634845; Sun, 04 Jan 2015 22:50:34 -0800 (PST) Received: from ayumi.isobedori.kobe.vergenet.net (p4076-ipbfp703kobeminato.hyogo.ocn.ne.jp. [122.20.17.76]) by mx.google.com with ESMTPSA id ph10sm37701920pdb.51.2015.01.04.22.50.32 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 04 Jan 2015 22:50:33 -0800 (PST) From: Simon Horman To: John Fastabend Cc: netdev@vger.kernel.org, Simon Horman Subject: [PATCH/RFC rocker-net-next 1/6] net: flow: Cancel innermost nested attribute first Date: Mon, 5 Jan 2015 15:50:05 +0900 Message-Id: <1420440610-20621-2-git-send-email-simon.horman@netronome.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1420440610-20621-1-git-send-email-simon.horman@netronome.com> References: <1420440610-20621-1-git-send-email-simon.horman@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Cancel innermost nested attribute first on error when putting flow actions. Signed-off-by: Simon Horman --- Its unclear to me if this makes any difference. But it seems more logical to me. --- net/core/flow_table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/flow_table.c b/net/core/flow_table.c index 542ebb5..2af831e 100644 --- a/net/core/flow_table.c +++ b/net/core/flow_table.c @@ -967,8 +967,8 @@ static int net_flow_put_flow_action(struct sk_buff *skb, err = net_flow_put_act_types(skb, a[i].args); if (err) { - nla_nest_cancel(skb, action); nla_nest_cancel(skb, sigs); + nla_nest_cancel(skb, action); return err; } nla_nest_end(skb, sigs);