Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[~andy/linux] / drivers / net / ethernet / qlogic / qlcnic / qlcnic_ethtool.c

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
index 6b08194aa0d4900f8e29a4c5eca433f1d1709d9c..18ced0fb6cf05324a8f3869bfd90f1907b377ad2 100644 (file)
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
@@ -229,7 +229,7 @@ static const u32 ext_diag_registers[] = {
        -1
 };
 
-#define QLCNIC_MGMT_API_VERSION        2
+#define QLCNIC_MGMT_API_VERSION        3
 #define QLCNIC_ETHTOOL_REGS_VER        4
 
 static inline int qlcnic_get_ring_regs_len(struct qlcnic_adapter *adapter)
@@ -527,6 +527,9 @@ qlcnic_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *p)
        regs_buff[0] = (0xcafe0000 | (QLCNIC_DEV_INFO_SIZE & 0xffff));
        regs_buff[1] = QLCNIC_MGMT_API_VERSION;
 
+       if (adapter->ahw->capabilities & QLC_83XX_ESWITCH_CAPABILITY)
+               regs_buff[2] = adapter->ahw->max_vnic_func;
+
        if (qlcnic_82xx_check(adapter))
                i = qlcnic_82xx_get_registers(adapter, regs_buff);
        else