Merge branch 'sched-couple-of-ndo_setup_tc-fixes-and-adjustments'

davem330 · davem330 · commit 064f390265be · 2018-06-25T16:14:04.000+09:00
Jiri Pirko says:

====================
net: sched: couple of ndo_setup_tc fixes and adjustments

This patchset includes couple of patches that fix or adjust default
cases and return values in ndo_setup_tc implementations in drivers.
====================

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git 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 = {
diff --git 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
@@ -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
@@ -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;
 	}
 }
 
diff --git 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,

Original file line number	Diff line number	Diff line change
`@@ -7522,7 +7522,7 @@ static int i40e_setup_tc_cls_flower(struct i40e_netdev_priv *np,`
`7522`	`7522`	`case TC_CLSFLOWER_STATS:`
`7523`	`7523`	`return -EOPNOTSUPP;`
`7524`	`7524`	`default:`
`7525`		`- return -EINVAL;`
	`7525`	`+ return -EOPNOTSUPP;`
`7526`	`7526`	`}`
`7527`	`7527`	`}`
`7528`	`7528`
Original file line number	Diff line number	Diff line change
`@@ -2884,7 +2884,7 @@ static int i40evf_setup_tc_cls_flower(struct i40evf_adapter *adapter,`
`2884`	`2884`	`case TC_CLSFLOWER_STATS:`
`2885`	`2885`	`return -EOPNOTSUPP;`
`2886`	`2886`	`default:`
`2887`		`- return -EINVAL;`
	`2887`	`+ return -EOPNOTSUPP;`
`2888`	`2888`	`}`
`2889`	`2889`	`}`
`2890`	`2890`
Original file line number	Diff line number	Diff line change
`@@ -2698,7 +2698,7 @@ static int igb_setup_tc_cls_flower(struct igb_adapter *adapter,`
`2698`	`2698`	`case TC_CLSFLOWER_STATS:`
`2699`	`2699`	`return -EOPNOTSUPP;`
`2700`	`2700`	`default:`
`2701`		`- return -EINVAL;`
	`2701`	`+ return -EOPNOTSUPP;`
`2702`	`2702`	`}`
`2703`	`2703`	`}`
`2704`	`2704`
Original file line number	Diff line number	Diff line change
`@@ -576,9 +576,9 @@ nfp_flower_repr_offload(struct nfp_app app, struct net_device netdev,`
`576`	`576`	`return nfp_flower_del_offload(app, netdev, flower, egress);`
`577`	`577`	`case TC_CLSFLOWER_STATS:`
`578`	`578`	`return nfp_flower_get_stats(app, netdev, flower, egress);`
	`579`	`+ default:`
	`580`	`+ return -EOPNOTSUPP;`
`579`	`581`	`}`
`580`		`-`
`581`		`- return -EOPNOTSUPP;`
`582`	`582`	`}`
`583`	`583`
`584`	`584`	`int nfp_flower_setup_tc_egress_cb(enum tc_setup_type type, void *type_data,`