ixgbe: Use correct FC setup function for x550em_a
authorMark Rustad <mark.d.rustad@intel.com>
Fri, 8 Apr 2016 23:19:29 +0000 (16:19 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Mon, 25 Apr 2016 11:06:15 +0000 (04:06 -0700)
Somehow the wrong fc_setup function was used for x550em_a, so
correct that. Also set setup_link to NULL as its value is
determined later, just like it is with X550EM_x.

Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c

index ea25f00..a17e398 100644 (file)
@@ -2926,13 +2926,13 @@ static struct ixgbe_mac_operations mac_ops_x550em_a = {
        .get_media_type         = ixgbe_get_media_type_X550em,
        .get_san_mac_addr       = NULL,
        .get_wwn_prefix         = NULL,
-       .setup_link             = &ixgbe_setup_mac_link_X540,
+       .setup_link             = NULL, /* defined later */
        .get_link_capabilities  = ixgbe_get_link_capabilities_X550em,
        .get_bus_info           = ixgbe_get_bus_info_X550em,
        .setup_sfp              = ixgbe_setup_sfp_modules_X550em,
        .acquire_swfw_sync      = ixgbe_acquire_swfw_sync_x550em_a,
        .release_swfw_sync      = ixgbe_release_swfw_sync_x550em_a,
-       .setup_fc               = ixgbe_setup_fc_generic,
+       .setup_fc               = ixgbe_setup_fc_x550em,
        .read_iosf_sb_reg       = ixgbe_read_iosf_sb_reg_x550a,
        .write_iosf_sb_reg      = ixgbe_write_iosf_sb_reg_x550a,
 };