From patchwork Thu Sep 22 13:21:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shmulik Ladkani X-Patchwork-Id: 673381 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 3sfxy80Bxrz9sC3 for ; Thu, 22 Sep 2016 23:23:12 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ravellosystems-com.20150623.gappssmtp.com header.i=@ravellosystems-com.20150623.gappssmtp.com header.b=ZBu8IGad; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933209AbcIVNXH (ORCPT ); Thu, 22 Sep 2016 09:23:07 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:37781 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932383AbcIVNXF (ORCPT ); Thu, 22 Sep 2016 09:23:05 -0400 Received: by mail-wm0-f51.google.com with SMTP id b130so148574986wmc.0 for ; Thu, 22 Sep 2016 06:23:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ravellosystems-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7o6y8b3VrWxAu7796tbUeSmi5jWQSv0cARVp9AwKYmo=; b=ZBu8IGad9Zt1H0IhKeVJCiONCA/d0NdjjuuRptWfr+iKEzV7s/QgnZ6IeqE8iwZA/p SlJcbofJGVZq1wisznBXifDIyG1TwEZLNMqwaSd0s4EG1T8VNwkJUuYm/8Asyo21Dnh4 F2ZbxHxbMlo29SvzRCeUs8Nh83MwX9i/w3pu08efiXl84sliOI/dcIQgUWvd6ati1Sht jNxX7ZGupOZOwDQOmEA423iKlXXdS/7V5CqEfrSIFVPLJoFjmEluqSAF8dRLhes0+ElV FGVNOQlYvgpb6RuYD1dWIi4IFdbFpLWSGfdjTo66INQcBHaiIizmNr/uPo9TOAXqtl0O eWBQ== 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=7o6y8b3VrWxAu7796tbUeSmi5jWQSv0cARVp9AwKYmo=; b=IoBXyKGRfWfnPa+txYKajJGUqfx8INeL8SKJjfG6xre3XGQKp892DVQd7ND2Fz/ZCy IdEFWMkT8Vo70C1AwL/DI689H6s1CwtMdxlybYhQ650Y16kUcgZ6hUDqwnrhBQOvLOys oH49+kxNt2ruMuLEMVVrTDi2udz1jfME2enaFeeChT86ipe7T2pWb+Mzhkoza/tQAWkj i5nIxzsRFpeyjScMjrH+AK6FKhiOMWdbTfQv+skmxKA64eBSee82IXs/bw6+THe8XvCI 3qbtQLfSAC6sH75EY3AAHZoS4DjELheUSIPKI6vjODFh3il4nPITqR+ncL8IxjCOKl1k LzQg== X-Gm-Message-State: AE9vXwOJjVx1Crhviav39XCsGSaBCltaX6yjOGLYYo0KbAvKfSA5fIodHFqKrEad/X4ucWbD X-Received: by 10.28.107.22 with SMTP id g22mr2426609wmc.31.1474550583991; Thu, 22 Sep 2016 06:23:03 -0700 (PDT) Received: from honey.ravello.local ([213.57.127.2]) by smtp.gmail.com with ESMTPSA id xy4sm2144589wjc.2.2016.09.22.06.23.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Sep 2016 06:23:03 -0700 (PDT) From: Shmulik Ladkani X-Google-Original-From: Shmulik Ladkani To: "David S. Miller" Cc: Jamal Hadi Salim , WANG Cong , Eric Dumazet , netdev@vger.kernel.org, Shmulik Ladkani Subject: [PATCH net-next 1/4] net/sched: act_mirred: Rename tcfm_ok_push to tcfm_mac_header_xmit Date: Thu, 22 Sep 2016 16:21:49 +0300 Message-Id: <1474550512-7552-2-git-send-email-shmulik.ladkani@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1474550512-7552-1-git-send-email-shmulik.ladkani@gmail.com> References: <1474550512-7552-1-git-send-email-shmulik.ladkani@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Shmulik Ladkani 'tcfm_ok_push' specifies whether a mac_len sized push is needed upon egress to the target device (if action is performed at ingress). Rename it to 'tcfm_mac_header_xmit' as this is actually an attribute of the target device. This allows to decouple the attribute from the action to be taken. Signed-off-by: Shmulik Ladkani --- include/net/tc_act/tc_mirred.h | 2 +- net/sched/act_mirred.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/net/tc_act/tc_mirred.h b/include/net/tc_act/tc_mirred.h index 62770ad..5275158 100644 --- a/include/net/tc_act/tc_mirred.h +++ b/include/net/tc_act/tc_mirred.h @@ -8,7 +8,7 @@ struct tcf_mirred { struct tc_action common; int tcfm_eaction; int tcfm_ifindex; - int tcfm_ok_push; + int tcfm_mac_header_xmit; struct net_device __rcu *tcfm_dev; struct list_head tcfm_list; }; diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c index 667dc38..7b03b13 100644 --- a/net/sched/act_mirred.c +++ b/net/sched/act_mirred.c @@ -63,7 +63,7 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla, struct tc_mirred *parm; struct tcf_mirred *m; struct net_device *dev; - int ret, ok_push = 0; + int ret, mac_header_xmit = 0; bool exists = false; if (nla == NULL) @@ -102,10 +102,10 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla, case ARPHRD_IPGRE: case ARPHRD_VOID: case ARPHRD_NONE: - ok_push = 0; + mac_header_xmit = 0; break; default: - ok_push = 1; + mac_header_xmit = 1; break; } } else { @@ -136,7 +136,7 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla, dev_put(rcu_dereference_protected(m->tcfm_dev, 1)); dev_hold(dev); rcu_assign_pointer(m->tcfm_dev, dev); - m->tcfm_ok_push = ok_push; + m->tcfm_mac_header_xmit = mac_header_xmit; } if (ret == ACT_P_CREATED) { @@ -181,7 +181,7 @@ static int tcf_mirred(struct sk_buff *skb, const struct tc_action *a, goto out; if (!(at & AT_EGRESS)) { - if (m->tcfm_ok_push) + if (m->tcfm_mac_header_xmit) skb_push_rcsum(skb2, skb->mac_len); }