From: Jiri Pirko <jiri@resnulli•us>
To: netdev@vger•kernel.org
Cc: davem@davemloft•net, nogahf@mellanox•com, jhs@mojatatu•com,
xiyou.wangcong@gmail•com, mlxsw@mellanox•com, andrew@lunn•ch,
vivien.didelot@savoirfairelinux•com, f.fainelli@gmail•com,
michael.chan@broadcom•com, ganeshgr@chelsio•com,
saeedm@mellanox•com, matanb@mellanox•com, leonro@mellanox•com,
idosch@mellanox•com, jakub.kicinski@netronome•com,
simon.horman@netronome•com, pieter.jansenvanvuuren@netronome•com,
john.hurley@netronome•com, alexander.h.duyck@intel•com,
ogerlitz@mellanox•com, john.fastabend@gmail•com
Subject: [patch net-next RFC 3/9] net_sch: cbs: Change TC_SETUP_CBS to TC_SETUP_QDISC_CBS
Date: Mon, 30 Oct 2017 09:56:07 +0100 [thread overview]
Message-ID: <20171030085613.8697-4-jiri@resnulli.us> (raw)
In-Reply-To: <20171030085613.8697-1-jiri@resnulli.us>
From: Nogah Frankel <nogahf@mellanox•com>
Change TC_SETUP_CBS to TC_SETUP_QDISC_CBS to match the new convention..
Signed-off-by: Nogah Frankel <nogahf@mellanox•com>
Signed-off-by: Jiri Pirko <jiri@mellanox•com>
---
drivers/net/ethernet/intel/igb/igb_main.c | 2 +-
include/linux/netdevice.h | 2 +-
net/sched/sch_cbs.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index b3d730f..fe0c2f4 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -2488,7 +2488,7 @@ static int igb_setup_tc(struct net_device *dev, enum tc_setup_type type,
struct igb_adapter *adapter = netdev_priv(dev);
switch (type) {
- case TC_SETUP_CBS:
+ case TC_SETUP_QDISC_CBS:
return igb_offload_cbs(adapter, type_data);
default:
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 732e2dc..ec58ef8 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -776,7 +776,7 @@ enum tc_setup_type {
TC_SETUP_CLSMATCHALL,
TC_SETUP_CLSBPF,
TC_SETUP_BLOCK,
- TC_SETUP_CBS,
+ TC_SETUP_QDISC_CBS,
TC_SETUP_QDISC_RED,
};
diff --git a/net/sched/sch_cbs.c b/net/sched/sch_cbs.c
index bdb533b..7a72980 100644
--- a/net/sched/sch_cbs.c
+++ b/net/sched/sch_cbs.c
@@ -212,7 +212,7 @@ static void cbs_disable_offload(struct net_device *dev,
cbs.queue = q->queue;
cbs.enable = 0;
- err = ops->ndo_setup_tc(dev, TC_SETUP_CBS, &cbs);
+ err = ops->ndo_setup_tc(dev, TC_SETUP_QDISC_CBS, &cbs);
if (err < 0)
pr_warn("Couldn't disable CBS offload for queue %d\n",
cbs.queue);
@@ -236,7 +236,7 @@ static int cbs_enable_offload(struct net_device *dev, struct cbs_sched_data *q,
cbs.idleslope = opt->idleslope;
cbs.sendslope = opt->sendslope;
- err = ops->ndo_setup_tc(dev, TC_SETUP_CBS, &cbs);
+ err = ops->ndo_setup_tc(dev, TC_SETUP_QDISC_CBS, &cbs);
if (err < 0)
return err;
--
2.9.5
next prev parent reply other threads:[~2017-10-30 8:56 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-30 8:56 [patch net-next RFC 0/9] qdisc RED offload Jiri Pirko
2017-10-30 8:56 ` [patch net-next RFC 1/9] net_sch: red: Add offload ability to RED qdisc Jiri Pirko
2017-10-30 12:20 ` David Miller
2017-10-30 13:54 ` Nogah Frankel
2017-10-30 19:24 ` David Ahern
2017-10-31 7:41 ` Jiri Pirko
2017-10-31 14:59 ` David Ahern
2017-10-31 15:03 ` Jiri Pirko
2017-10-30 12:47 ` Roman Mashak
2017-10-30 14:10 ` Nogah Frankel
2017-10-30 8:56 ` [patch net-next RFC 2/9] net_sch: mqprio: Change TC_SETUP_MQPRIO to TC_SETUP_QDISC_MQPRIO Jiri Pirko
2017-11-01 15:31 ` Simon Horman
2017-11-02 6:48 ` Jiri Pirko
2017-10-30 8:56 ` Jiri Pirko [this message]
2017-10-30 8:56 ` [patch net-next RFC 4/9] mlxsw: reg: Add cwtp & cwtpm registers Jiri Pirko
2017-10-30 8:56 ` [patch net-next RFC 5/9] mlxsw: spectrum: Support RED qdisc offload Jiri Pirko
2017-10-30 8:56 ` [patch net-next RFC 6/9] mlxsw: reg: Add ext and tc-cong counter groups Jiri Pirko
2017-10-30 8:56 ` [patch net-next RFC 7/9] mlxsw: spectrum: Collect tclass related stats periodically Jiri Pirko
2017-10-30 8:56 ` [patch net-next RFC 8/9] mlxsw: spectrum: Support RED xstats Jiri Pirko
2017-10-30 8:56 ` [patch net-next RFC 9/9] mlxsw: spectrum: Support general qdisc stats Jiri Pirko
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=20171030085613.8697-4-jiri@resnulli.us \
--to=jiri@resnulli$(echo .)us \
--cc=alexander.h.duyck@intel$(echo .)com \
--cc=andrew@lunn$(echo .)ch \
--cc=davem@davemloft$(echo .)net \
--cc=f.fainelli@gmail$(echo .)com \
--cc=ganeshgr@chelsio$(echo .)com \
--cc=idosch@mellanox$(echo .)com \
--cc=jakub.kicinski@netronome$(echo .)com \
--cc=jhs@mojatatu$(echo .)com \
--cc=john.fastabend@gmail$(echo .)com \
--cc=john.hurley@netronome$(echo .)com \
--cc=leonro@mellanox$(echo .)com \
--cc=matanb@mellanox$(echo .)com \
--cc=michael.chan@broadcom$(echo .)com \
--cc=mlxsw@mellanox$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=nogahf@mellanox$(echo .)com \
--cc=ogerlitz@mellanox$(echo .)com \
--cc=pieter.jansenvanvuuren@netronome$(echo .)com \
--cc=saeedm@mellanox$(echo .)com \
--cc=simon.horman@netronome$(echo .)com \
--cc=vivien.didelot@savoirfairelinux$(echo .)com \
--cc=xiyou.wangcong@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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