ixgbe: Add SR-IOV feature support to X540

Add X540 specific feature support to X540

Signed-off-by: Greg Rose <gregory.v.rose@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index ca9036de49f9b1eabcff87f2f5499b01ab3aecba..c90562530202c9a0316abba314235a3f23620dca 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -6889,7 +6889,7 @@ static void __devinit ixgbe_probe_vf(struct ixgbe_adapter *adapter,
        struct ixgbe_hw *hw = &adapter->hw;
        int err;
 
-       if (hw->mac.type != ixgbe_mac_82599EB || !max_vfs)
+       if (hw->mac.type == ixgbe_mac_82598EB || !max_vfs)
                return;
 
        /* The 82599 supports up to 64 VFs per physical function

diff --git a/drivers/net/ixgbe/ixgbe_mbx.c b/drivers/net/ixgbe/ixgbe_mbx.c
index 027c628c3aaed040dce66a720179ea86efc0a6bd..ea82c5a1cd3ead752938593b1e59db8ba887f333 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_mbx.c
+++ b/drivers/net/ixgbe/ixgbe_mbx.c
@@ -321,9 +321,11 @@ static s32 ixgbe_check_for_rst_pf(struct ixgbe_hw *hw, u16 vf_number)
 
        switch (hw->mac.type) {
        case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
                vflre = IXGBE_READ_REG(hw, IXGBE_VFLRE(reg_offset));
                break;
+       case ixgbe_mac_X540:
+               vflre = IXGBE_READ_REG(hw, IXGBE_VFLREC(reg_offset));
+               break;
        default:
                break;
        }

diff --git a/drivers/net/ixgbe/ixgbe_x540.c b/drivers/net/ixgbe/ixgbe_x540.c
index cf88515c0ef8e71e273e507abda6a29025ca6e28..3a8923993ce38039ce72f523f4d369b2c0328f26 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_x540.c
+++ b/drivers/net/ixgbe/ixgbe_x540.c
@@ -685,6 +685,8 @@ static struct ixgbe_mac_operations mac_ops_X540 = {
        .fc_enable              = &ixgbe_fc_enable_generic,
        .init_uta_tables        = &ixgbe_init_uta_tables_generic,
        .setup_sfp              = NULL,
+       .set_mac_anti_spoofing  = &ixgbe_set_mac_anti_spoofing,
+       .set_vlan_anti_spoofing = &ixgbe_set_vlan_anti_spoofing,
 };
 
 static struct ixgbe_eeprom_operations eeprom_ops_X540 = {