diff options
Diffstat (limited to 'drivers/net/ixgb/ixgb_hw.c')
-rw-r--r-- | drivers/net/ixgb/ixgb_hw.c | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/drivers/net/ixgb/ixgb_hw.c b/drivers/net/ixgb/ixgb_hw.c index 69329c73095a..620cad48bdea 100644 --- a/drivers/net/ixgb/ixgb_hw.c +++ b/drivers/net/ixgb/ixgb_hw.c | |||
@@ -47,9 +47,22 @@ static void ixgb_optics_reset(struct ixgb_hw *hw); | |||
47 | 47 | ||
48 | static ixgb_phy_type ixgb_identify_phy(struct ixgb_hw *hw); | 48 | static ixgb_phy_type ixgb_identify_phy(struct ixgb_hw *hw); |
49 | 49 | ||
50 | uint32_t ixgb_mac_reset(struct ixgb_hw *hw); | 50 | static void ixgb_clear_hw_cntrs(struct ixgb_hw *hw); |
51 | 51 | ||
52 | uint32_t ixgb_mac_reset(struct ixgb_hw *hw) | 52 | static void ixgb_clear_vfta(struct ixgb_hw *hw); |
53 | |||
54 | static void ixgb_init_rx_addrs(struct ixgb_hw *hw); | ||
55 | |||
56 | static uint16_t ixgb_read_phy_reg(struct ixgb_hw *hw, | ||
57 | uint32_t reg_address, | ||
58 | uint32_t phy_address, | ||
59 | uint32_t device_type); | ||
60 | |||
61 | static boolean_t ixgb_setup_fc(struct ixgb_hw *hw); | ||
62 | |||
63 | static boolean_t mac_addr_valid(uint8_t *mac_addr); | ||
64 | |||
65 | static uint32_t ixgb_mac_reset(struct ixgb_hw *hw) | ||
53 | { | 66 | { |
54 | uint32_t ctrl_reg; | 67 | uint32_t ctrl_reg; |
55 | 68 | ||
@@ -335,7 +348,7 @@ ixgb_init_hw(struct ixgb_hw *hw) | |||
335 | * of the receive addresss registers. Clears the multicast table. Assumes | 348 | * of the receive addresss registers. Clears the multicast table. Assumes |
336 | * the receiver is in reset when the routine is called. | 349 | * the receiver is in reset when the routine is called. |
337 | *****************************************************************************/ | 350 | *****************************************************************************/ |
338 | void | 351 | static void |
339 | ixgb_init_rx_addrs(struct ixgb_hw *hw) | 352 | ixgb_init_rx_addrs(struct ixgb_hw *hw) |
340 | { | 353 | { |
341 | uint32_t i; | 354 | uint32_t i; |
@@ -604,7 +617,7 @@ ixgb_write_vfta(struct ixgb_hw *hw, | |||
604 | * | 617 | * |
605 | * hw - Struct containing variables accessed by shared code | 618 | * hw - Struct containing variables accessed by shared code |
606 | *****************************************************************************/ | 619 | *****************************************************************************/ |
607 | void | 620 | static void |
608 | ixgb_clear_vfta(struct ixgb_hw *hw) | 621 | ixgb_clear_vfta(struct ixgb_hw *hw) |
609 | { | 622 | { |
610 | uint32_t offset; | 623 | uint32_t offset; |
@@ -620,7 +633,7 @@ ixgb_clear_vfta(struct ixgb_hw *hw) | |||
620 | * hw - Struct containing variables accessed by shared code | 633 | * hw - Struct containing variables accessed by shared code |
621 | *****************************************************************************/ | 634 | *****************************************************************************/ |
622 | 635 | ||
623 | boolean_t | 636 | static boolean_t |
624 | ixgb_setup_fc(struct ixgb_hw *hw) | 637 | ixgb_setup_fc(struct ixgb_hw *hw) |
625 | { | 638 | { |
626 | uint32_t ctrl_reg; | 639 | uint32_t ctrl_reg; |
@@ -722,7 +735,7 @@ ixgb_setup_fc(struct ixgb_hw *hw) | |||
722 | * This requires that first an address cycle command is sent, followed by a | 735 | * This requires that first an address cycle command is sent, followed by a |
723 | * read command. | 736 | * read command. |
724 | *****************************************************************************/ | 737 | *****************************************************************************/ |
725 | uint16_t | 738 | static uint16_t |
726 | ixgb_read_phy_reg(struct ixgb_hw *hw, | 739 | ixgb_read_phy_reg(struct ixgb_hw *hw, |
727 | uint32_t reg_address, | 740 | uint32_t reg_address, |
728 | uint32_t phy_address, | 741 | uint32_t phy_address, |
@@ -815,7 +828,7 @@ ixgb_read_phy_reg(struct ixgb_hw *hw, | |||
815 | * This requires that first an address cycle command is sent, followed by a | 828 | * This requires that first an address cycle command is sent, followed by a |
816 | * write command. | 829 | * write command. |
817 | *****************************************************************************/ | 830 | *****************************************************************************/ |
818 | void | 831 | static void |
819 | ixgb_write_phy_reg(struct ixgb_hw *hw, | 832 | ixgb_write_phy_reg(struct ixgb_hw *hw, |
820 | uint32_t reg_address, | 833 | uint32_t reg_address, |
821 | uint32_t phy_address, | 834 | uint32_t phy_address, |
@@ -959,7 +972,7 @@ boolean_t ixgb_check_for_bad_link(struct ixgb_hw *hw) | |||
959 | * | 972 | * |
960 | * hw - Struct containing variables accessed by shared code | 973 | * hw - Struct containing variables accessed by shared code |
961 | *****************************************************************************/ | 974 | *****************************************************************************/ |
962 | void | 975 | static void |
963 | ixgb_clear_hw_cntrs(struct ixgb_hw *hw) | 976 | ixgb_clear_hw_cntrs(struct ixgb_hw *hw) |
964 | { | 977 | { |
965 | volatile uint32_t temp_reg; | 978 | volatile uint32_t temp_reg; |
@@ -1114,7 +1127,7 @@ ixgb_get_bus_info(struct ixgb_hw *hw) | |||
1114 | * mac_addr - pointer to MAC address. | 1127 | * mac_addr - pointer to MAC address. |
1115 | * | 1128 | * |
1116 | *****************************************************************************/ | 1129 | *****************************************************************************/ |
1117 | boolean_t | 1130 | static boolean_t |
1118 | mac_addr_valid(uint8_t *mac_addr) | 1131 | mac_addr_valid(uint8_t *mac_addr) |
1119 | { | 1132 | { |
1120 | boolean_t is_valid = TRUE; | 1133 | boolean_t is_valid = TRUE; |