aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel
diff options
context:
space:
mode:
authorMark Rustad <mark.d.rustad@intel.com>2016-04-08 19:19:29 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2016-04-25 07:06:15 -0400
commita0254a70b4f91396ad04b1225dd7c10a680d38ff (patch)
tree4fc42fddc6bb55781583dbd4957d7b6f9df3cb31 /drivers/net/ethernet/intel
parenta02a5a53418a6039893f5d5a9373cf18080fded2 (diff)
ixgbe: Use correct FC setup function for x550em_a
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>
Diffstat (limited to 'drivers/net/ethernet/intel')
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
index ea25f001f3bb..a17e398d56b8 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
@@ -2926,13 +2926,13 @@ static struct ixgbe_mac_operations mac_ops_x550em_a = {
2926 .get_media_type = ixgbe_get_media_type_X550em, 2926 .get_media_type = ixgbe_get_media_type_X550em,
2927 .get_san_mac_addr = NULL, 2927 .get_san_mac_addr = NULL,
2928 .get_wwn_prefix = NULL, 2928 .get_wwn_prefix = NULL,
2929 .setup_link = &ixgbe_setup_mac_link_X540, 2929 .setup_link = NULL, /* defined later */
2930 .get_link_capabilities = ixgbe_get_link_capabilities_X550em, 2930 .get_link_capabilities = ixgbe_get_link_capabilities_X550em,
2931 .get_bus_info = ixgbe_get_bus_info_X550em, 2931 .get_bus_info = ixgbe_get_bus_info_X550em,
2932 .setup_sfp = ixgbe_setup_sfp_modules_X550em, 2932 .setup_sfp = ixgbe_setup_sfp_modules_X550em,
2933 .acquire_swfw_sync = ixgbe_acquire_swfw_sync_x550em_a, 2933 .acquire_swfw_sync = ixgbe_acquire_swfw_sync_x550em_a,
2934 .release_swfw_sync = ixgbe_release_swfw_sync_x550em_a, 2934 .release_swfw_sync = ixgbe_release_swfw_sync_x550em_a,
2935 .setup_fc = ixgbe_setup_fc_generic, 2935 .setup_fc = ixgbe_setup_fc_x550em,
2936 .read_iosf_sb_reg = ixgbe_read_iosf_sb_reg_x550a, 2936 .read_iosf_sb_reg = ixgbe_read_iosf_sb_reg_x550a,
2937 .write_iosf_sb_reg = ixgbe_write_iosf_sb_reg_x550a, 2937 .write_iosf_sb_reg = ixgbe_write_iosf_sb_reg_x550a,
2938}; 2938};