Home » Mailing list archives » linux-netdev » 2010 » August » 25

[PATCH 0/4]qlcnic: updates

Previous thread: [PATCH NEXT 2/4] qlcnic: support port vlan id by Amit Kumar Salecha on Wednesday, August 25, 2010 - 7:03 am. (1 message)

Next thread: [net-next] ipv6: Enable netlink notification for tentative addresses. by Ben Greear on Wednesday, August 25, 2010 - 11:26 am. (9 messages)
[view original message]
From: Amit Kumar Salecha
Subject: [PATCH 0/4]qlcnic: updates
Date: Wednesday, August 25, 2010 - 7:03 am

Hi
  Series of 4 patches to update and fix qlcnic driver.
  Apply them on net-next.

-Amit
--


[ message continues ]
[view original message]
From: Amit Kumar Salecha
Subject: [PATCH NEXT 1/4] qlcnic: eswitch config fixes
Date: Wednesday, August 25, 2010 - 7:03 am

From: Rajesh Borundia <rajesh.borundia@qlogic.com>

o remove validation before deleting vlan id
o Add missing 'break' while deleting vlan id.

Signed-off-by: Rajesh Borundia <rajesh.borundia@qlogic.com>
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
---
 drivers/net/qlcnic/qlcnic_ctx.c  |    1 +
 drivers/net/qlcnic/qlcnic_main.c |   26 ++++++++++++++------------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/drivers/net/qlcnic/qlcnic_ctx.c b/drivers/net/qlcnic/qlcnic_ctx.c
index 315705b..bd4b06b 100644
--- a/drivers/net/qlcnic/qlcnic_ctx.c
+++ b/drivers/net/qlcnic/qlcnic_ctx.c
@@ -1160,6 +1160,7 @@ int qlcnic_config_switch_port(struct qlcnic_adapter *adapter,
 	case QLCNIC_DEL_VLAN:
 			arg1 |= (BIT_3 | BIT_5);
 			arg1 &= ~(0x0ffff << 16);
+			break;
 	default:
 		return err;
 	}
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index 46b9137..5d93b46 100644
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -3301,8 +3301,6 @@ validate_esw_config(struct qlcnic_adapter *adapter,
 				return QL_STATUS_INVALID_PARAM;
 			break;
 		case QLCNIC_DEL_VLAN:
-			if (!IS_VALID_VLAN(esw_cfg[i].vlan_id))
-				return QL_STATUS_INVALID_PARAM;
 			if (!esw_cfg[i].op_type)
 				return QL_STATUS_INVALID_PARAM;
 			break;
@@ -3338,21 +3336,25 @@ qlcnic_sysfs_write_esw_config(struct file *file, struct kobject *kobj,
 		if (adapter->op_mode == QLCNIC_MGMT_FUNC)
 			if (qlcnic_config_switch_port(adapter, &esw_cfg[i]))
 				return QL_STATUS_INVALID_PARAM;
-		if (adapter->ahw.pci_func == esw_cfg[i].pci_func)
-			op_mode = esw_cfg[i].op_mode;
-			qlcnic_get_eswitch_port_config(adapter, &esw_cfg[i]);
-			esw_cfg[i].op_mode = op_mode;
-			esw_cfg[i].pci_func = adapter->ahw.pci_func;
-			switch (esw_cfg[i].op_mode) {
-			case QLCNIC_PORT_DEFAULTS:
-				qlcnic_set_eswitch_port_features(adapter,
-								&esw_cfg[i]);
-				break;
+
+		if (adapter->ahw.pci_func != ...
[ message continues ]
[view original message]
From: David Miller
Subject: Re: [PATCH 0/4]qlcnic: updates
Date: Wednesday, August 25, 2010 - 2:15 pm

From: Amit Kumar Salecha <amit.salecha@qlogic.com>

Applied, thanks.
--


[ message continues ]
Previous thread: [PATCH NEXT 2/4] qlcnic: support port vlan id by Amit Kumar Salecha on Wednesday, August 25, 2010 - 7:03 am. (1 message)

Next thread: [net-next] ipv6: Enable netlink notification for tentative addresses. by Ben Greear on Wednesday, August 25, 2010 - 11:26 am. (9 messages)