X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fbnxt%2Fbnxt_ethdev.c;h=8025e33e9a9bfe4fd8ee724d5b53b9b4b84c8aec;hb=c1d4e9d37abdc6c07a05f7d96928e624fea9ebb5;hp=f1350d39dac3e30cff992832ed7ac25705c7b3c6;hpb=d743042821de258b8034a95530200a3a9cd59678;p=dpdk.git

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index f1350d39da..8025e33e9a 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -4344,8 +4344,6 @@ static const struct eth_dev_ops bnxt_dev_ops = {
 	.tx_burst_mode_get = bnxt_tx_burst_mode_get,
 	.dev_led_on = bnxt_dev_led_on_op,
 	.dev_led_off = bnxt_dev_led_off_op,
-	.xstats_get_by_id = bnxt_dev_xstats_get_by_id_op,
-	.xstats_get_names_by_id = bnxt_dev_xstats_get_names_by_id_op,
 	.rx_queue_start = bnxt_rx_queue_start,
 	.rx_queue_stop = bnxt_rx_queue_stop,
 	.tx_queue_start = bnxt_tx_queue_start,
@@ -6304,7 +6302,7 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,
 	struct bnxt *backing_bp;
 	uint16_t num_rep;
 	int i, ret = 0;
-	struct rte_kvargs *kvlist;
+	struct rte_kvargs *kvlist = NULL;
 
 	num_rep = eth_da.nb_representor_ports;
 	if (num_rep > BNXT_MAX_VF_REPS) {
@@ -6358,49 +6356,74 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,
 			 * Invoked as for ex: "-w 000:00:0d.0,
 			 * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>"
 			 */
-			rte_kvargs_process(kvlist, BNXT_DEVARG_REP_IS_PF,
-					   bnxt_parse_devarg_rep_is_pf,
-					   (void *)&representor);
+			ret = rte_kvargs_process(kvlist, BNXT_DEVARG_REP_IS_PF,
+						 bnxt_parse_devarg_rep_is_pf,
+						 (void *)&representor);
+			if (ret) {
+				ret = -EINVAL;
+				goto err;
+			}
 			/*
 			 * Handler for "rep_based_pf" devarg.
 			 * Invoked as for ex: "-w 000:00:0d.0,
 			 * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>"
 			 */
-			rte_kvargs_process(kvlist, BNXT_DEVARG_REP_BASED_PF,
-					   bnxt_parse_devarg_rep_based_pf,
-					   (void *)&representor);
+			ret = rte_kvargs_process(kvlist,
+						 BNXT_DEVARG_REP_BASED_PF,
+						 bnxt_parse_devarg_rep_based_pf,
+						 (void *)&representor);
+			if (ret) {
+				ret = -EINVAL;
+				goto err;
+			}
 			/*
 			 * Handler for "rep_based_pf" devarg.
 			 * Invoked as for ex: "-w 000:00:0d.0,
 			 * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>"
 			 */
-			rte_kvargs_process(kvlist, BNXT_DEVARG_REP_Q_R2F,
-					   bnxt_parse_devarg_rep_q_r2f,
-					   (void *)&representor);
+			ret = rte_kvargs_process(kvlist, BNXT_DEVARG_REP_Q_R2F,
+						 bnxt_parse_devarg_rep_q_r2f,
+						 (void *)&representor);
+			if (ret) {
+				ret = -EINVAL;
+				goto err;
+			}
 			/*
 			 * Handler for "rep_based_pf" devarg.
 			 * Invoked as for ex: "-w 000:00:0d.0,
 			 * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>"
 			 */
-			rte_kvargs_process(kvlist, BNXT_DEVARG_REP_Q_F2R,
-					   bnxt_parse_devarg_rep_q_f2r,
-					   (void *)&representor);
+			ret = rte_kvargs_process(kvlist, BNXT_DEVARG_REP_Q_F2R,
+						 bnxt_parse_devarg_rep_q_f2r,
+						 (void *)&representor);
+			if (ret) {
+				ret = -EINVAL;
+				goto err;
+			}
 			/*
 			 * Handler for "rep_based_pf" devarg.
 			 * Invoked as for ex: "-w 000:00:0d.0,
 			 * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>"
 			 */
-			rte_kvargs_process(kvlist, BNXT_DEVARG_REP_FC_R2F,
-					   bnxt_parse_devarg_rep_fc_r2f,
-					   (void *)&representor);
+			ret = rte_kvargs_process(kvlist, BNXT_DEVARG_REP_FC_R2F,
+						 bnxt_parse_devarg_rep_fc_r2f,
+						 (void *)&representor);
+			if (ret) {
+				ret = -EINVAL;
+				goto err;
+			}
 			/*
 			 * Handler for "rep_based_pf" devarg.
 			 * Invoked as for ex: "-w 000:00:0d.0,
 			 * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>"
 			 */
-			rte_kvargs_process(kvlist, BNXT_DEVARG_REP_FC_F2R,
-					   bnxt_parse_devarg_rep_fc_f2r,
-					   (void *)&representor);
+			ret = rte_kvargs_process(kvlist, BNXT_DEVARG_REP_FC_F2R,
+						 bnxt_parse_devarg_rep_fc_f2r,
+						 (void *)&representor);
+			if (ret) {
+				ret = -EINVAL;
+				goto err;
+			}
 		}
 
 		ret = rte_eth_dev_create(&pci_dev->device, name,
@@ -6430,6 +6453,7 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,
 
 	}
 
+	rte_kvargs_free(kvlist);
 	return 0;
 
 err:
@@ -6438,6 +6462,8 @@ err:
 	 */
 	if (num_rep > 1)
 		bnxt_pci_remove_dev_with_reps(backing_eth_dev);
+	rte_errno = -ret;
+	rte_kvargs_free(kvlist);
 
 	return ret;
 }