aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ethernet/broadcom/tg3.c8
-rw-r--r--drivers/net/ethernet/broadcom/tg3.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 328373e0578f..060a6f386104 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -4283,7 +4283,7 @@ static void tg3_power_down(struct tg3 *tp)
4283 pci_set_power_state(tp->pdev, PCI_D3hot); 4283 pci_set_power_state(tp->pdev, PCI_D3hot);
4284} 4284}
4285 4285
4286static void tg3_aux_stat_to_speed_duplex(struct tg3 *tp, u32 val, u16 *speed, u8 *duplex) 4286static void tg3_aux_stat_to_speed_duplex(struct tg3 *tp, u32 val, u32 *speed, u8 *duplex)
4287{ 4287{
4288 switch (val & MII_TG3_AUX_STAT_SPDMASK) { 4288 switch (val & MII_TG3_AUX_STAT_SPDMASK) {
4289 case MII_TG3_AUX_STAT_10HALF: 4289 case MII_TG3_AUX_STAT_10HALF:
@@ -4787,7 +4787,7 @@ static int tg3_setup_copper_phy(struct tg3 *tp, bool force_reset)
4787 bool current_link_up; 4787 bool current_link_up;
4788 u32 bmsr, val; 4788 u32 bmsr, val;
4789 u32 lcl_adv, rmt_adv; 4789 u32 lcl_adv, rmt_adv;
4790 u16 current_speed; 4790 u32 current_speed;
4791 u8 current_duplex; 4791 u8 current_duplex;
4792 int i, err; 4792 int i, err;
4793 4793
@@ -5719,7 +5719,7 @@ out:
5719static int tg3_setup_fiber_phy(struct tg3 *tp, bool force_reset) 5719static int tg3_setup_fiber_phy(struct tg3 *tp, bool force_reset)
5720{ 5720{
5721 u32 orig_pause_cfg; 5721 u32 orig_pause_cfg;
5722 u16 orig_active_speed; 5722 u32 orig_active_speed;
5723 u8 orig_active_duplex; 5723 u8 orig_active_duplex;
5724 u32 mac_status; 5724 u32 mac_status;
5725 bool current_link_up; 5725 bool current_link_up;
@@ -5823,7 +5823,7 @@ static int tg3_setup_fiber_mii_phy(struct tg3 *tp, bool force_reset)
5823{ 5823{
5824 int err = 0; 5824 int err = 0;
5825 u32 bmsr, bmcr; 5825 u32 bmsr, bmcr;
5826 u16 current_speed = SPEED_UNKNOWN; 5826 u32 current_speed = SPEED_UNKNOWN;
5827 u8 current_duplex = DUPLEX_UNKNOWN; 5827 u8 current_duplex = DUPLEX_UNKNOWN;
5828 bool current_link_up = false; 5828 bool current_link_up = false;
5829 u32 local_adv, remote_adv, sgsr; 5829 u32 local_adv, remote_adv, sgsr;
diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
index a772a33b685c..6953d0546acb 100644
--- a/drivers/net/ethernet/broadcom/tg3.h
+++ b/drivers/net/ethernet/broadcom/tg3.h
@@ -2873,7 +2873,7 @@ struct tg3_tx_ring_info {
2873struct tg3_link_config { 2873struct tg3_link_config {
2874 /* Describes what we're trying to get. */ 2874 /* Describes what we're trying to get. */
2875 u32 advertising; 2875 u32 advertising;
2876 u16 speed; 2876 u32 speed;
2877 u8 duplex; 2877 u8 duplex;
2878 u8 autoneg; 2878 u8 autoneg;
2879 u8 flowctrl; 2879 u8 flowctrl;
@@ -2882,7 +2882,7 @@ struct tg3_link_config {
2882 u8 active_flowctrl; 2882 u8 active_flowctrl;
2883 2883
2884 u8 active_duplex; 2884 u8 active_duplex;
2885 u16 active_speed; 2885 u32 active_speed;
2886 u32 rmt_adv; 2886 u32 rmt_adv;
2887}; 2887};
2888 2888