* [patch net-next 1/3] bnxt: simplify cls_flower command switch and handle default case
2018-06-24 8:38 [patch net-next 0/3] net: sched: couple of ndo_setup_tc fixes and adjustments Jiri Pirko
@ 2018-06-24 8:38 ` Jiri Pirko
2018-06-24 8:38 ` [patch net-next 2/3] nfp: handle cls_flower command " Jiri Pirko
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Jiri Pirko @ 2018-06-24 8:38 UTC (permalink / raw)
To: netdev
Cc: davem, jakub.kicinski, simon.horman, john.hurley,
pieter.jansenvanvuuren, oss-drivers, michael.chan,
intel-wired-lan, mlxsw
From: Jiri Pirko <jiri@mellanox.com>
Currently the default case is not handled, which with future command
introductions would introduce a warning. So handle it and make the
switch a bit simplier removing unneeded "rc" variable.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
index 795f45024c20..d0699f39ba34 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
@@ -1544,22 +1544,16 @@ void bnxt_tc_flow_stats_work(struct bnxt *bp)
int bnxt_tc_setup_flower(struct bnxt *bp, u16 src_fid,
struct tc_cls_flower_offload *cls_flower)
{
- int rc = 0;
-
switch (cls_flower->command) {
case TC_CLSFLOWER_REPLACE:
- rc = bnxt_tc_add_flow(bp, src_fid, cls_flower);
- break;
-
+ return bnxt_tc_add_flow(bp, src_fid, cls_flower);
case TC_CLSFLOWER_DESTROY:
- rc = bnxt_tc_del_flow(bp, cls_flower);
- break;
-
+ return bnxt_tc_del_flow(bp, cls_flower);
case TC_CLSFLOWER_STATS:
- rc = bnxt_tc_get_flow_stats(bp, cls_flower);
- break;
+ return bnxt_tc_get_flow_stats(bp, cls_flower);
+ default:
+ return -EOPNOTSUPP;
}
- return rc;
}
static const struct rhashtable_params bnxt_tc_flow_ht_params = {
--
2.14.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [patch net-next 2/3] nfp: handle cls_flower command default case
2018-06-24 8:38 [patch net-next 0/3] net: sched: couple of ndo_setup_tc fixes and adjustments Jiri Pirko
2018-06-24 8:38 ` [patch net-next 1/3] bnxt: simplify cls_flower command switch and handle default case Jiri Pirko
@ 2018-06-24 8:38 ` Jiri Pirko
2018-06-25 3:11 ` Jakub Kicinski
2018-06-24 8:38 ` [patch net-next 3/3] cls_flower: fix error values for commands not supported by drivers Jiri Pirko
2018-06-25 7:15 ` [patch net-next 0/3] net: sched: couple of ndo_setup_tc fixes and adjustments David Miller
3 siblings, 1 reply; 6+ messages in thread
From: Jiri Pirko @ 2018-06-24 8:38 UTC (permalink / raw)
To: netdev
Cc: davem, jakub.kicinski, simon.horman, john.hurley,
pieter.jansenvanvuuren, oss-drivers, michael.chan,
intel-wired-lan, mlxsw
From: Jiri Pirko <jiri@mellanox.com>
Currently the default case is not handled, which with future command
introductions would introduce a warning. So handle it.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
drivers/net/ethernet/netronome/nfp/flower/offload.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/netronome/nfp/flower/offload.c b/drivers/net/ethernet/netronome/nfp/flower/offload.c
index c42e64f32333..c0e74aa4cb5e 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/offload.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c
@@ -576,9 +576,9 @@ nfp_flower_repr_offload(struct nfp_app *app, struct net_device *netdev,
return nfp_flower_del_offload(app, netdev, flower, egress);
case TC_CLSFLOWER_STATS:
return nfp_flower_get_stats(app, netdev, flower, egress);
+ default:
+ return -EOPNOTSUPP;
}
-
- return -EOPNOTSUPP;
}
int nfp_flower_setup_tc_egress_cb(enum tc_setup_type type, void *type_data,
--
2.14.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [patch net-next 2/3] nfp: handle cls_flower command default case
2018-06-24 8:38 ` [patch net-next 2/3] nfp: handle cls_flower command " Jiri Pirko
@ 2018-06-25 3:11 ` Jakub Kicinski
0 siblings, 0 replies; 6+ messages in thread
From: Jakub Kicinski @ 2018-06-25 3:11 UTC (permalink / raw)
To: Jiri Pirko
Cc: netdev, davem, simon.horman, john.hurley, pieter.jansenvanvuuren,
oss-drivers, michael.chan, intel-wired-lan, mlxsw
On Sun, 24 Jun 2018 10:38:38 +0200, Jiri Pirko wrote:
> From: Jiri Pirko <jiri@mellanox.com>
>
> Currently the default case is not handled, which with future command
> introductions would introduce a warning. So handle it.
>
> Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [patch net-next 3/3] cls_flower: fix error values for commands not supported by drivers
2018-06-24 8:38 [patch net-next 0/3] net: sched: couple of ndo_setup_tc fixes and adjustments Jiri Pirko
2018-06-24 8:38 ` [patch net-next 1/3] bnxt: simplify cls_flower command switch and handle default case Jiri Pirko
2018-06-24 8:38 ` [patch net-next 2/3] nfp: handle cls_flower command " Jiri Pirko
@ 2018-06-24 8:38 ` Jiri Pirko
2018-06-25 7:15 ` [patch net-next 0/3] net: sched: couple of ndo_setup_tc fixes and adjustments David Miller
3 siblings, 0 replies; 6+ messages in thread
From: Jiri Pirko @ 2018-06-24 8:38 UTC (permalink / raw)
To: netdev
Cc: davem, jakub.kicinski, simon.horman, john.hurley,
pieter.jansenvanvuuren, oss-drivers, michael.chan,
intel-wired-lan, mlxsw
From: Jiri Pirko <jiri@mellanox.com>
-EOPNOTSUPP is the error value that should be reported if a flower
command is not supported by a driver. Fix it in couple of Intel drivers.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +-
drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 +-
drivers/net/ethernet/intel/igb/igb_main.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 95e9dfbe9839..7ad2b1b0b125 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -7522,7 +7522,7 @@ static int i40e_setup_tc_cls_flower(struct i40e_netdev_priv *np,
case TC_CLSFLOWER_STATS:
return -EOPNOTSUPP;
default:
- return -EINVAL;
+ return -EOPNOTSUPP;
}
}
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index a7b87f935411..dc56a8667495 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -2884,7 +2884,7 @@ static int i40evf_setup_tc_cls_flower(struct i40evf_adapter *adapter,
case TC_CLSFLOWER_STATS:
return -EOPNOTSUPP;
default:
- return -EINVAL;
+ return -EOPNOTSUPP;
}
}
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index f707709969ac..6a78d8272eb2 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -2698,7 +2698,7 @@ static int igb_setup_tc_cls_flower(struct igb_adapter *adapter,
case TC_CLSFLOWER_STATS:
return -EOPNOTSUPP;
default:
- return -EINVAL;
+ return -EOPNOTSUPP;
}
}
--
2.14.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [patch net-next 0/3] net: sched: couple of ndo_setup_tc fixes and adjustments
2018-06-24 8:38 [patch net-next 0/3] net: sched: couple of ndo_setup_tc fixes and adjustments Jiri Pirko
` (2 preceding siblings ...)
2018-06-24 8:38 ` [patch net-next 3/3] cls_flower: fix error values for commands not supported by drivers Jiri Pirko
@ 2018-06-25 7:15 ` David Miller
3 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2018-06-25 7:15 UTC (permalink / raw)
To: jiri
Cc: netdev, jakub.kicinski, simon.horman, john.hurley,
pieter.jansenvanvuuren, oss-drivers, michael.chan,
intel-wired-lan, mlxsw
From: Jiri Pirko <jiri@resnulli.us>
Date: Sun, 24 Jun 2018 10:38:36 +0200
> From: Jiri Pirko <jiri@mellanox.com>
>
> This patchset includes couple of patches that fix or adjust default
> cases and return values in ndo_setup_tc implementations in drivers.
Series applied, thanks Jiri.
^ permalink raw reply [flat|nested] 6+ messages in thread