diff options
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 2 | ||||
-rw-r--r-- | drivers/net/ixgbe/ixgbe_mbx.c | 4 | ||||
-rw-r--r-- | drivers/net/ixgbe/ixgbe_x540.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index ca9036de49f9..c90562530202 100644 --- 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, | |||
6889 | struct ixgbe_hw *hw = &adapter->hw; | 6889 | struct ixgbe_hw *hw = &adapter->hw; |
6890 | int err; | 6890 | int err; |
6891 | 6891 | ||
6892 | if (hw->mac.type != ixgbe_mac_82599EB || !max_vfs) | 6892 | if (hw->mac.type == ixgbe_mac_82598EB || !max_vfs) |
6893 | return; | 6893 | return; |
6894 | 6894 | ||
6895 | /* The 82599 supports up to 64 VFs per physical function | 6895 | /* 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 027c628c3aae..ea82c5a1cd3e 100644 --- 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) | |||
321 | 321 | ||
322 | switch (hw->mac.type) { | 322 | switch (hw->mac.type) { |
323 | case ixgbe_mac_82599EB: | 323 | case ixgbe_mac_82599EB: |
324 | case ixgbe_mac_X540: | ||
325 | vflre = IXGBE_READ_REG(hw, IXGBE_VFLRE(reg_offset)); | 324 | vflre = IXGBE_READ_REG(hw, IXGBE_VFLRE(reg_offset)); |
326 | break; | 325 | break; |
326 | case ixgbe_mac_X540: | ||
327 | vflre = IXGBE_READ_REG(hw, IXGBE_VFLREC(reg_offset)); | ||
328 | break; | ||
327 | default: | 329 | default: |
328 | break; | 330 | break; |
329 | } | 331 | } |
diff --git a/drivers/net/ixgbe/ixgbe_x540.c b/drivers/net/ixgbe/ixgbe_x540.c index cf88515c0ef8..3a8923993ce3 100644 --- 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 = { | |||
685 | .fc_enable = &ixgbe_fc_enable_generic, | 685 | .fc_enable = &ixgbe_fc_enable_generic, |
686 | .init_uta_tables = &ixgbe_init_uta_tables_generic, | 686 | .init_uta_tables = &ixgbe_init_uta_tables_generic, |
687 | .setup_sfp = NULL, | 687 | .setup_sfp = NULL, |
688 | .set_mac_anti_spoofing = &ixgbe_set_mac_anti_spoofing, | ||
689 | .set_vlan_anti_spoofing = &ixgbe_set_vlan_anti_spoofing, | ||
688 | }; | 690 | }; |
689 | 691 | ||
690 | static struct ixgbe_eeprom_operations eeprom_ops_X540 = { | 692 | static struct ixgbe_eeprom_operations eeprom_ops_X540 = { |