diff options
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_82598.c')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_82598.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/ixgbe/ixgbe_82598.c b/drivers/net/ixgbe/ixgbe_82598.c index 51dba1c78e1e..623737fb719b 100644 --- a/drivers/net/ixgbe/ixgbe_82598.c +++ b/drivers/net/ixgbe/ixgbe_82598.c | |||
@@ -1046,9 +1046,9 @@ out: | |||
1046 | * | 1046 | * |
1047 | * Determines physical layer capabilities of the current configuration. | 1047 | * Determines physical layer capabilities of the current configuration. |
1048 | **/ | 1048 | **/ |
1049 | static s32 ixgbe_get_supported_physical_layer_82598(struct ixgbe_hw *hw) | 1049 | static u32 ixgbe_get_supported_physical_layer_82598(struct ixgbe_hw *hw) |
1050 | { | 1050 | { |
1051 | s32 physical_layer = IXGBE_PHYSICAL_LAYER_UNKNOWN; | 1051 | u32 physical_layer = IXGBE_PHYSICAL_LAYER_UNKNOWN; |
1052 | 1052 | ||
1053 | switch (hw->device_id) { | 1053 | switch (hw->device_id) { |
1054 | case IXGBE_DEV_ID_82598: | 1054 | case IXGBE_DEV_ID_82598: |
@@ -1111,8 +1111,11 @@ static struct ixgbe_mac_operations mac_ops_82598 = { | |||
1111 | .clear_hw_cntrs = &ixgbe_clear_hw_cntrs_generic, | 1111 | .clear_hw_cntrs = &ixgbe_clear_hw_cntrs_generic, |
1112 | .get_media_type = &ixgbe_get_media_type_82598, | 1112 | .get_media_type = &ixgbe_get_media_type_82598, |
1113 | .get_supported_physical_layer = &ixgbe_get_supported_physical_layer_82598, | 1113 | .get_supported_physical_layer = &ixgbe_get_supported_physical_layer_82598, |
1114 | .enable_rx_dma = &ixgbe_enable_rx_dma_generic, | ||
1114 | .get_mac_addr = &ixgbe_get_mac_addr_generic, | 1115 | .get_mac_addr = &ixgbe_get_mac_addr_generic, |
1115 | .stop_adapter = &ixgbe_stop_adapter_generic, | 1116 | .stop_adapter = &ixgbe_stop_adapter_generic, |
1117 | .get_bus_info = &ixgbe_get_bus_info_generic, | ||
1118 | .set_lan_id = &ixgbe_set_lan_id_multi_port_pcie, | ||
1116 | .read_analog_reg8 = &ixgbe_read_analog_reg8_82598, | 1119 | .read_analog_reg8 = &ixgbe_read_analog_reg8_82598, |
1117 | .write_analog_reg8 = &ixgbe_write_analog_reg8_82598, | 1120 | .write_analog_reg8 = &ixgbe_write_analog_reg8_82598, |
1118 | .setup_link = &ixgbe_setup_mac_link_82598, | 1121 | .setup_link = &ixgbe_setup_mac_link_82598, |