Netdev List
 help / color / mirror / Atom feed
From: Jiri Pirko <jiri@resnulli.us>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, jhs@mojatatu.com, xiyou.wangcong@gmail.com,
	daniel@iogearbox.net, mlxsw@mellanox.com, andrew@lunn.ch,
	vivien.didelot@savoirfairelinux.com, f.fainelli@gmail.com,
	simon.horman@netronome.com, pieter.jansenvanvuuren@netronome.com,
	dirk.vandermerwe@netronome.com, alexander.h.duyck@intel.com,
	amritha.nambiar@intel.com, oss-drivers@netronome.com,
	yisen.zhuang@huawei.com, salil.mehta@huawei.com
Subject: [patch net-next v2 10/16] dsa: push cls_matchall setup_tc processing into a separate function
Date: Mon,  7 Aug 2017 10:15:26 +0200	[thread overview]
Message-ID: <20170807081532.32760-11-jiri@resnulli.us> (raw)
In-Reply-To: <20170807081532.32760-1-jiri@resnulli.us>

From: Jiri Pirko <jiri@mellanox.com>

Let dsa_slave_setup_tc be a splitter for specific setup_tc types and
push out cls_matchall specific code into a separate function.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
---
 net/dsa/slave.c | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 453f6dd..e76d576 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -863,26 +863,35 @@ static void dsa_slave_del_cls_matchall(struct net_device *dev,
 	kfree(mall_tc_entry);
 }
 
-static int dsa_slave_setup_tc(struct net_device *dev, enum tc_setup_type type,
-			      u32 handle, u32 chain_index, __be16 protocol,
-			      struct tc_to_netdev *tc)
+static int dsa_slave_setup_tc_cls_matchall(struct net_device *dev,
+					   u32 handle, u32 chain_index,
+					   __be16 protocol,
+					   struct tc_cls_matchall_offload *cls)
 {
 	bool ingress = TC_H_MAJ(handle) == TC_H_MAJ(TC_H_INGRESS);
 
 	if (chain_index)
 		return -EOPNOTSUPP;
 
+	switch (cls->command) {
+	case TC_CLSMATCHALL_REPLACE:
+		return dsa_slave_add_cls_matchall(dev, protocol, cls, ingress);
+	case TC_CLSMATCHALL_DESTROY:
+		dsa_slave_del_cls_matchall(dev, cls);
+		return 0;
+	default:
+		return -EOPNOTSUPP;
+	}
+}
+
+static int dsa_slave_setup_tc(struct net_device *dev, enum tc_setup_type type,
+			      u32 handle, u32 chain_index, __be16 protocol,
+			      struct tc_to_netdev *tc)
+{
 	switch (type) {
 	case TC_SETUP_CLSMATCHALL:
-		switch (tc->cls_mall->command) {
-		case TC_CLSMATCHALL_REPLACE:
-			return dsa_slave_add_cls_matchall(dev, protocol,
-							  tc->cls_mall,
-							  ingress);
-		case TC_CLSMATCHALL_DESTROY:
-			dsa_slave_del_cls_matchall(dev, tc->cls_mall);
-			return 0;
-		}
+		return dsa_slave_setup_tc_cls_matchall(dev, handle, chain_index,
+						       protocol, tc->cls_mall);
 	default:
 		return -EOPNOTSUPP;
 	}
-- 
2.9.3

  parent reply	other threads:[~2017-08-07  8:15 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-07  8:15 [patch net-next v2 00/16] net: sched: summer cleanup part 2, ndo_setup_tc Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 01/16] net: sched: make type an argument for ndo_setup_tc Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 02/16] net: sched: rename TC_SETUP_MATCHALL to TC_SETUP_CLSMATCHALL Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 03/16] net: sched: make egress_dev flag part of flower offload struct Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 04/16] cxgb4: push cls_u32 setup_tc processing into a separate function Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 05/16] ixgbe: push cls_u32 and mqprio setup_tc processing into separate functions Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 06/16] mlx5e: push cls_flower " Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 07/16] mlx5e_rep: push cls_flower setup_tc processing into a separate function Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 08/16] mlxsw: spectrum: push cls_flower and cls_matchall setup_tc processing into separate functions Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 09/16] mlxsw: spectrum: rename cls arg in matchall processing Jiri Pirko
2017-08-07  8:15 ` Jiri Pirko [this message]
2017-08-07  8:15 ` [patch net-next v2 11/16] nfp: change flows in apps that offload ndo_setup_tc Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 12/16] hns3pf: don't check handle during mqprio offload Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 13/16] net: sched: push cls related args into cls_common structure Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 14/16] net: sched: move prio into cls_common Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 15/16] net: sched: change return value of ndo_setup_tc for driver supporting mqprio only Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 16/16] net: sched: get rid of struct tc_to_netdev Jiri Pirko
2017-08-07 16:43 ` [patch net-next v2 00/16] net: sched: summer cleanup part 2, ndo_setup_tc David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170807081532.32760-11-jiri@resnulli.us \
    --to=jiri@resnulli.us \
    --cc=alexander.h.duyck@intel.com \
    --cc=amritha.nambiar@intel.com \
    --cc=andrew@lunn.ch \
    --cc=daniel@iogearbox.net \
    --cc=davem@davemloft.net \
    --cc=dirk.vandermerwe@netronome.com \
    --cc=f.fainelli@gmail.com \
    --cc=jhs@mojatatu.com \
    --cc=mlxsw@mellanox.com \
    --cc=netdev@vger.kernel.org \
    --cc=oss-drivers@netronome.com \
    --cc=pieter.jansenvanvuuren@netronome.com \
    --cc=salil.mehta@huawei.com \
    --cc=simon.horman@netronome.com \
    --cc=vivien.didelot@savoirfairelinux.com \
    --cc=xiyou.wangcong@gmail.com \
    --cc=yisen.zhuang@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox