X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fnet%2Fsfc%2Fsfc_flow.c;h=110dfb897649abf8693a698898125fabf700b623;hb=bce6c42c4ad5;hp=23cf379966baef91a6f7ca6e4eca28f8e9b52c5b;hpb=244cfa79a41c70f8c58692dd2601687a65e928c3;p=dpdk.git

diff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c
index 23cf379966..110dfb8976 100644
--- a/drivers/net/sfc/sfc_flow.c
+++ b/drivers/net/sfc/sfc_flow.c
@@ -837,8 +837,7 @@ sfc_flow_parse_pattern(const struct rte_flow_item pattern[],
 		return -rte_errno;
 	}
 
-	for (; pattern != NULL &&
-	       pattern->type != RTE_FLOW_ITEM_TYPE_END; pattern++) {
+	for (; pattern->type != RTE_FLOW_ITEM_TYPE_END; pattern++) {
 		item = sfc_flow_get_item(pattern->type);
 		if (item == NULL) {
 			rte_flow_error_set(error, ENOTSUP,
@@ -868,13 +867,6 @@ sfc_flow_parse_pattern(const struct rte_flow_item pattern[],
 			prev_layer = item->layer;
 	}
 
-	if (pattern == NULL) {
-		rte_flow_error_set(error, EINVAL,
-				   RTE_FLOW_ERROR_TYPE_ITEM, NULL,
-				   "NULL item");
-		return -rte_errno;
-	}
-
 	return 0;
 }
 
@@ -1120,12 +1112,35 @@ sfc_flow_flush(struct rte_eth_dev *dev,
 	return -ret;
 }
 
+static int
+sfc_flow_isolate(struct rte_eth_dev *dev, int enable,
+		 struct rte_flow_error *error)
+{
+	struct sfc_adapter *sa = dev->data->dev_private;
+	struct sfc_port *port = &sa->port;
+	int ret = 0;
+
+	sfc_adapter_lock(sa);
+	if (sa->state != SFC_ADAPTER_INITIALIZED) {
+		rte_flow_error_set(error, EBUSY,
+				   RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+				   NULL, "please close the port first");
+		ret = -rte_errno;
+	} else {
+		port->isolated = (enable) ? B_TRUE : B_FALSE;
+	}
+	sfc_adapter_unlock(sa);
+
+	return ret;
+}
+
 const struct rte_flow_ops sfc_flow_ops = {
 	.validate = sfc_flow_validate,
 	.create = sfc_flow_create,
 	.destroy = sfc_flow_destroy,
 	.flush = sfc_flow_flush,
 	.query = NULL,
+	.isolate = sfc_flow_isolate,
 };
 
 void