From 9b2bf8ddbe7be5f90c1b7dff60b0ca0e38d2f0a1 Mon Sep 17 00:00:00 2001 From: Amit Kumar Salecha Date: Thu, 2 Dec 2010 20:41:43 +0000 Subject: [PATCH] --- yaml --- r: 224778 b: refs/heads/master c: 091056b2ad04df09a3cb78a4c4ea098709b98eb3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/qlcnic/qlcnic_main.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 94f1c191c7b4..62fd22f3104b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97319a270da37a5eab14a770f1417d8229245270 +refs/heads/master: 091056b2ad04df09a3cb78a4c4ea098709b98eb3 diff --git a/trunk/drivers/net/qlcnic/qlcnic_main.c b/trunk/drivers/net/qlcnic/qlcnic_main.c index 08d4b37f246c..4e8466b326af 100644 --- a/trunk/drivers/net/qlcnic/qlcnic_main.c +++ b/trunk/drivers/net/qlcnic/qlcnic_main.c @@ -3537,9 +3537,12 @@ validate_esw_config(struct qlcnic_adapter *adapter, case QLCNIC_PORT_DEFAULTS: if (QLC_DEV_GET_DRV(op_mode, pci_func) != QLCNIC_NON_PRIV_FUNC) { - esw_cfg[i].mac_anti_spoof = 0; - esw_cfg[i].mac_override = 1; - esw_cfg[i].promisc_mode = 1; + if (esw_cfg[i].mac_anti_spoof != 0) + return QL_STATUS_INVALID_PARAM; + if (esw_cfg[i].mac_override != 1) + return QL_STATUS_INVALID_PARAM; + if (esw_cfg[i].promisc_mode != 1) + return QL_STATUS_INVALID_PARAM; } break; case QLCNIC_ADD_VLAN: