diff options
| author |   Rajesh Borundia <rajesh.borundia@qlogic.com> | 2010-10-07 23:46:09 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-10-08 13:59:10 -0700 |
| commit | ee07c1a70117fe93cf71686d481791c2498f80d2 (patch) | |
| tree | f275d7b88a23a48257b0941ca69b9809a16cc9b7 /drivers/net/qlcnic | |
| parent | qlcnic: fix board description (diff) | |
| download | linux-dev-ee07c1a70117fe93cf71686d481791c2498f80d2.tar.xz linux-dev-ee07c1a70117fe93cf71686d481791c2498f80d2.zip | |
qlcnic: fix promiscous mode for VF
o Allow promiscous mode setting for VF's depending upon the configuration.
Signed-off-by: Rajesh Borundia <rajesh.borundia@qlogic.com>
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/qlcnic')
| -rw-r--r-- | drivers/net/qlcnic/qlcnic.h | 1 | ||||
| -rw-r--r-- | drivers/net/qlcnic/qlcnic_hw.c | 3 | ||||
| -rw-r--r-- | drivers/net/qlcnic/qlcnic_main.c | 9 |
3 files changed, 10 insertions, 3 deletions
diff --git a/drivers/net/qlcnic/qlcnic.h b/drivers/net/qlcnic/qlcnic.h index 46a54b3ccea6..4025e203e8ae 100644 --- a/drivers/net/qlcnic/qlcnic.h +++ b/drivers/net/qlcnic/qlcnic.h @@ -920,6 +920,7 @@ struct qlcnic_ipaddr { #define QLCNIC_TAGGING_ENABLED 0x100 #define QLCNIC_MACSPOOF 0x200 #define QLCNIC_MAC_OVERRIDE_DISABLED 0x400 +#define QLCNIC_PROMISC_DISABLED 0x800 #define QLCNIC_IS_MSI_FAMILY(adapter) \ ((adapter)->flags & (QLCNIC_MSI_ENABLED | QLCNIC_MSIX_ENABLED)) diff --git a/drivers/net/qlcnic/qlcnic_hw.c b/drivers/net/qlcnic/qlcnic_hw.c index 7f1f9b4ca0ff..53e805316f4a 100644 --- a/drivers/net/qlcnic/qlcnic_hw.c +++ b/drivers/net/qlcnic/qlcnic_hw.c @@ -442,7 +442,8 @@ void qlcnic_set_multi(struct net_device *netdev) qlcnic_nic_add_mac(adapter, bcast_addr); if (netdev->flags & IFF_PROMISC) { - mode = VPORT_MISS_MODE_ACCEPT_ALL; + if (!(adapter->flags & QLCNIC_PROMISC_DISABLED)) + mode = VPORT_MISS_MODE_ACCEPT_ALL; goto send_fw_cmd; } diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c index e3c1b80e00b1..4aada0b8ceb1 100644 --- a/drivers/net/qlcnic/qlcnic_main.c +++ b/drivers/net/qlcnic/qlcnic_main.c @@ -718,8 +718,8 @@ static void qlcnic_set_eswitch_port_features(struct qlcnic_adapter *adapter, struct qlcnic_esw_func_cfg *esw_cfg) { - adapter->flags &= ~QLCNIC_MACSPOOF; - adapter->flags &= ~QLCNIC_MAC_OVERRIDE_DISABLED; + adapter->flags &= ~(QLCNIC_MACSPOOF | QLCNIC_MAC_OVERRIDE_DISABLED | + QLCNIC_PROMISC_DISABLED); if (esw_cfg->mac_anti_spoof) adapter->flags |= QLCNIC_MACSPOOF; @@ -727,6 +727,9 @@ qlcnic_set_eswitch_port_features(struct qlcnic_adapter *adapter, if (!esw_cfg->mac_override) adapter->flags |= QLCNIC_MAC_OVERRIDE_DISABLED; + if (!esw_cfg->promisc_mode) + adapter->flags |= QLCNIC_PROMISC_DISABLED; + qlcnic_set_netdev_features(adapter, esw_cfg); } @@ -845,6 +848,7 @@ qlcnic_set_default_offload_settings(struct qlcnic_adapter *adapter) esw_cfg.pci_func = i; esw_cfg.offload_flags = BIT_0; esw_cfg.mac_override = BIT_0; + esw_cfg.promisc_mode = BIT_0; if (adapter->capabilities & QLCNIC_FW_CAPABILITY_TSO) esw_cfg.offload_flags |= (BIT_1 | BIT_2); if (qlcnic_config_switch_port(adapter, &esw_cfg)) @@ -3571,6 +3575,7 @@ validate_esw_config(struct qlcnic_adapter *adapter, QLCNIC_NON_PRIV_FUNC) { esw_cfg[i].mac_anti_spoof = 0; esw_cfg[i].mac_override = 1; + esw_cfg[i].promisc_mode = 1; } break; case QLCNIC_ADD_VLAN: |