diff options
| author | Rajesh Borundia <rajesh.borundia@qlogic.com> | 2013-04-19 07:01:12 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-19 16:14:40 -0400 |
| commit | 91b7282b613d4da65e8b4c87d521156cdc64c169 (patch) | |
| tree | 1b412de7cd339ab96922cd9e427572bf123c8ff0 /drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h | |
| parent | 4000e7a78d12d71e37fcd2366c73fcb02e97fffb (diff) | |
| download | blackbird-op-linux-91b7282b613d4da65e8b4c87d521156cdc64c169.tar.gz blackbird-op-linux-91b7282b613d4da65e8b4c87d521156cdc64c169.zip | |
qlcnic: Support VLAN id config.
o Add support for VLAN id configuration per VF using
iproute2 tool.
o VLAN id's 1-4094 are treated as PVID by the PF and
Guest VLAN tagging is not allowed by default.
o PVID is disabled when the VLAN id is set to 0
o Guest VLAN tagging is allowed when the VLAN id is set to 4095.
o Only one Guest VLAN id is supported.
o VLAN id can be changed only when the VF driver is not loaded.
Signed-off-by: Manish Chopra <manish.chopra@qlogic.com>
Signed-off-by: Sucheta Chakraborty <sucheta.chakraborty@qlogic.com>
Signed-off-by: Rajesh Borundia <rajesh.borundia@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h index 5f73d42d6689..d85fbb57c25b 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h @@ -48,6 +48,8 @@ struct qlcnic_bc_hdr { enum qlcnic_bc_commands { QLCNIC_BC_CMD_CHANNEL_INIT = 0x0, QLCNIC_BC_CMD_CHANNEL_TERM = 0x1, + QLCNIC_BC_CMD_GET_ACL = 0x2, + QLCNIC_BC_CMD_CFG_GUEST_VLAN = 0x3, }; #define QLC_BC_CMD 1 @@ -95,6 +97,12 @@ enum qlcnic_vf_state { QLC_BC_VF_SOFT_FLR, }; +enum qlcnic_vlan_mode { + QLC_NO_VLAN_MODE = 0, + QLC_PVID_MODE, + QLC_GUEST_VLAN_MODE, +}; + struct qlcnic_resources { u16 num_tx_mac_filters; u16 num_rx_ucast_mac_filters; @@ -118,6 +126,9 @@ struct qlcnic_vport { u16 handle; u16 max_tx_bw; u16 min_tx_bw; + u8 vlan_mode; + u16 vlan; + u8 qos; u8 mac[6]; }; @@ -156,6 +167,11 @@ struct qlcnic_back_channel { struct qlcnic_sriov { u16 vp_handle; u8 num_vfs; + u8 any_vlan; + u8 vlan_mode; + u16 num_allowed_vlans; + u16 *allowed_vlans; + u16 vlan; struct qlcnic_resources ff_max; struct qlcnic_back_channel bc; struct qlcnic_vf_info *vf_info; @@ -177,6 +193,7 @@ int __qlcnic_sriov_add_act_list(struct qlcnic_sriov *, struct qlcnic_vf_info *, struct qlcnic_bc_trans *); int qlcnic_sriov_get_vf_vport_info(struct qlcnic_adapter *, struct qlcnic_info *, u16); +int qlcnic_sriov_cfg_vf_guest_vlan(struct qlcnic_adapter *, u16, u8); static inline bool qlcnic_sriov_enable_check(struct qlcnic_adapter *adapter) { @@ -207,6 +224,7 @@ int qlcnic_sriov_set_vf_mac(struct net_device *, int, u8 *); int qlcnic_sriov_set_vf_tx_rate(struct net_device *, int, int); int qlcnic_sriov_get_vf_config(struct net_device *, int , struct ifla_vf_info *); +int qlcnic_sriov_set_vf_vlan(struct net_device *, int, u16, u8); #else static inline void qlcnic_sriov_pf_disable(struct qlcnic_adapter *adapter) {} static inline void qlcnic_sriov_pf_cleanup(struct qlcnic_adapter *adapter) {} |
