diff options
author | Rajesh Borundia <rajesh.borundia@qlogic.com> | 2010-08-31 13:17:50 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-01 13:41:56 -0400 |
commit | 7373373d100e5aebe751af0b2609a9a01dad5ac1 (patch) | |
tree | 3816ae48d6f3f33beeb20f2c66b2b4ab333dc1fa /drivers/net/qlcnic/qlcnic_main.c | |
parent | dcb50afff747d15fc2ffff762c08c325e4c229e5 (diff) |
qlcnic: fix mac override capability
o Rename mac_learning to mac_override
o Added check in set_mac to return error if mac override is disabled.
o Disabling mac_override only supported for Non priviledged functions.
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/qlcnic_main.c')
-rw-r--r-- | drivers/net/qlcnic/qlcnic_main.c | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c index 789fe817cfca..130f4dbe2f4b 100644 --- a/drivers/net/qlcnic/qlcnic_main.c +++ b/drivers/net/qlcnic/qlcnic_main.c | |||
@@ -343,6 +343,9 @@ static int qlcnic_set_mac(struct net_device *netdev, void *p) | |||
343 | struct qlcnic_adapter *adapter = netdev_priv(netdev); | 343 | struct qlcnic_adapter *adapter = netdev_priv(netdev); |
344 | struct sockaddr *addr = p; | 344 | struct sockaddr *addr = p; |
345 | 345 | ||
346 | if ((adapter->flags & QLCNIC_MAC_OVERRIDE_DISABLED)) | ||
347 | return -EOPNOTSUPP; | ||
348 | |||
346 | if (!is_valid_ether_addr(addr->sa_data)) | 349 | if (!is_valid_ether_addr(addr->sa_data)) |
347 | return -EINVAL; | 350 | return -EINVAL; |
348 | 351 | ||
@@ -741,10 +744,14 @@ qlcnic_set_eswitch_port_features(struct qlcnic_adapter *adapter, | |||
741 | struct qlcnic_esw_func_cfg *esw_cfg) | 744 | struct qlcnic_esw_func_cfg *esw_cfg) |
742 | { | 745 | { |
743 | adapter->flags &= ~QLCNIC_MACSPOOF; | 746 | adapter->flags &= ~QLCNIC_MACSPOOF; |
747 | adapter->flags &= ~QLCNIC_MAC_OVERRIDE_DISABLED; | ||
744 | 748 | ||
745 | if (esw_cfg->mac_anti_spoof) | 749 | if (esw_cfg->mac_anti_spoof) |
746 | adapter->flags |= QLCNIC_MACSPOOF; | 750 | adapter->flags |= QLCNIC_MACSPOOF; |
747 | 751 | ||
752 | if (!esw_cfg->mac_override) | ||
753 | adapter->flags |= QLCNIC_MAC_OVERRIDE_DISABLED; | ||
754 | |||
748 | qlcnic_set_netdev_features(adapter, esw_cfg); | 755 | qlcnic_set_netdev_features(adapter, esw_cfg); |
749 | } | 756 | } |
750 | 757 | ||
@@ -862,14 +869,14 @@ qlcnic_set_default_offload_settings(struct qlcnic_adapter *adapter) | |||
862 | memset(&esw_cfg, 0, sizeof(struct qlcnic_esw_func_cfg)); | 869 | memset(&esw_cfg, 0, sizeof(struct qlcnic_esw_func_cfg)); |
863 | esw_cfg.pci_func = i; | 870 | esw_cfg.pci_func = i; |
864 | esw_cfg.offload_flags = BIT_0; | 871 | esw_cfg.offload_flags = BIT_0; |
865 | esw_cfg.mac_learning = BIT_0; | 872 | esw_cfg.mac_override = BIT_0; |
866 | if (adapter->capabilities & QLCNIC_FW_CAPABILITY_TSO) | 873 | if (adapter->capabilities & QLCNIC_FW_CAPABILITY_TSO) |
867 | esw_cfg.offload_flags |= (BIT_1 | BIT_2); | 874 | esw_cfg.offload_flags |= (BIT_1 | BIT_2); |
868 | if (qlcnic_config_switch_port(adapter, &esw_cfg)) | 875 | if (qlcnic_config_switch_port(adapter, &esw_cfg)) |
869 | return -EIO; | 876 | return -EIO; |
870 | npar = &adapter->npars[i]; | 877 | npar = &adapter->npars[i]; |
871 | npar->pvid = esw_cfg.vlan_id; | 878 | npar->pvid = esw_cfg.vlan_id; |
872 | npar->mac_learning = esw_cfg.offload_flags; | 879 | npar->mac_override = esw_cfg.mac_override; |
873 | npar->mac_anti_spoof = esw_cfg.mac_anti_spoof; | 880 | npar->mac_anti_spoof = esw_cfg.mac_anti_spoof; |
874 | npar->discard_tagged = esw_cfg.discard_tagged; | 881 | npar->discard_tagged = esw_cfg.discard_tagged; |
875 | npar->promisc_mode = esw_cfg.promisc_mode; | 882 | npar->promisc_mode = esw_cfg.promisc_mode; |
@@ -887,7 +894,7 @@ qlcnic_reset_eswitch_config(struct qlcnic_adapter *adapter, | |||
887 | esw_cfg.op_mode = QLCNIC_PORT_DEFAULTS; | 894 | esw_cfg.op_mode = QLCNIC_PORT_DEFAULTS; |
888 | esw_cfg.pci_func = pci_func; | 895 | esw_cfg.pci_func = pci_func; |
889 | esw_cfg.vlan_id = npar->pvid; | 896 | esw_cfg.vlan_id = npar->pvid; |
890 | esw_cfg.mac_learning = npar->mac_learning; | 897 | esw_cfg.mac_override = npar->mac_override; |
891 | esw_cfg.discard_tagged = npar->discard_tagged; | 898 | esw_cfg.discard_tagged = npar->discard_tagged; |
892 | esw_cfg.mac_anti_spoof = npar->mac_anti_spoof; | 899 | esw_cfg.mac_anti_spoof = npar->mac_anti_spoof; |
893 | esw_cfg.offload_flags = npar->offload_flags; | 900 | esw_cfg.offload_flags = npar->offload_flags; |
@@ -3042,6 +3049,10 @@ qlcnicvf_start_firmware(struct qlcnic_adapter *adapter) | |||
3042 | 3049 | ||
3043 | qlcnic_check_options(adapter); | 3050 | qlcnic_check_options(adapter); |
3044 | 3051 | ||
3052 | err = qlcnic_set_eswitch_port_config(adapter); | ||
3053 | if (err) | ||
3054 | return err; | ||
3055 | |||
3045 | adapter->need_fw_reset = 0; | 3056 | adapter->need_fw_reset = 0; |
3046 | 3057 | ||
3047 | return err; | 3058 | return err; |
@@ -3397,8 +3408,10 @@ validate_esw_config(struct qlcnic_adapter *adapter, | |||
3397 | switch (esw_cfg[i].op_mode) { | 3408 | switch (esw_cfg[i].op_mode) { |
3398 | case QLCNIC_PORT_DEFAULTS: | 3409 | case QLCNIC_PORT_DEFAULTS: |
3399 | if (QLC_DEV_GET_DRV(op_mode, pci_func) != | 3410 | if (QLC_DEV_GET_DRV(op_mode, pci_func) != |
3400 | QLCNIC_NON_PRIV_FUNC) | 3411 | QLCNIC_NON_PRIV_FUNC) { |
3401 | esw_cfg[i].mac_anti_spoof = 0; | 3412 | esw_cfg[i].mac_anti_spoof = 0; |
3413 | esw_cfg[i].mac_override = 1; | ||
3414 | } | ||
3402 | break; | 3415 | break; |
3403 | case QLCNIC_ADD_VLAN: | 3416 | case QLCNIC_ADD_VLAN: |
3404 | if (!IS_VALID_VLAN(esw_cfg[i].vlan_id)) | 3417 | if (!IS_VALID_VLAN(esw_cfg[i].vlan_id)) |
@@ -3474,7 +3487,7 @@ qlcnic_sysfs_write_esw_config(struct file *file, struct kobject *kobj, | |||
3474 | switch (esw_cfg[i].op_mode) { | 3487 | switch (esw_cfg[i].op_mode) { |
3475 | case QLCNIC_PORT_DEFAULTS: | 3488 | case QLCNIC_PORT_DEFAULTS: |
3476 | npar->promisc_mode = esw_cfg[i].promisc_mode; | 3489 | npar->promisc_mode = esw_cfg[i].promisc_mode; |
3477 | npar->mac_learning = esw_cfg[i].mac_learning; | 3490 | npar->mac_override = esw_cfg[i].mac_override; |
3478 | npar->offload_flags = esw_cfg[i].offload_flags; | 3491 | npar->offload_flags = esw_cfg[i].offload_flags; |
3479 | npar->mac_anti_spoof = esw_cfg[i].mac_anti_spoof; | 3492 | npar->mac_anti_spoof = esw_cfg[i].mac_anti_spoof; |
3480 | npar->discard_tagged = esw_cfg[i].discard_tagged; | 3493 | npar->discard_tagged = esw_cfg[i].discard_tagged; |