diff options
author | Michael Chan <mchan@broadcom.com> | 2007-05-05 15:11:21 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-05-05 15:11:21 -0400 |
commit | 5cf64b8a7399999439f0d6748babb1ccb6bcad7c (patch) | |
tree | 6357ac40ddf95f171ed8c5f9bdae2ad8755981f1 /drivers/net/tg3.c | |
parent | 986e0aeb9ae09127b401c3baa66f15b7a31f354c (diff) |
[TG3]: Eliminate the TG3_FLAG_GOT_SERDES_FLOWCTL flag.
This flag does not do anything useful.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r-- | drivers/net/tg3.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 321121874c77..ff157b704864 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -2595,10 +2595,8 @@ static int tg3_setup_fiber_by_hand(struct tg3 *tp, u32 mac_status) | |||
2595 | { | 2595 | { |
2596 | int current_link_up = 0; | 2596 | int current_link_up = 0; |
2597 | 2597 | ||
2598 | if (!(mac_status & MAC_STATUS_PCS_SYNCED)) { | 2598 | if (!(mac_status & MAC_STATUS_PCS_SYNCED)) |
2599 | tp->tg3_flags &= ~TG3_FLAG_GOT_SERDES_FLOWCTL; | ||
2600 | goto out; | 2599 | goto out; |
2601 | } | ||
2602 | 2600 | ||
2603 | if (tp->link_config.autoneg == AUTONEG_ENABLE) { | 2601 | if (tp->link_config.autoneg == AUTONEG_ENABLE) { |
2604 | u32 flags; | 2602 | u32 flags; |
@@ -2616,7 +2614,6 @@ static int tg3_setup_fiber_by_hand(struct tg3 *tp, u32 mac_status) | |||
2616 | 2614 | ||
2617 | tg3_setup_flow_control(tp, local_adv, remote_adv); | 2615 | tg3_setup_flow_control(tp, local_adv, remote_adv); |
2618 | 2616 | ||
2619 | tp->tg3_flags |= TG3_FLAG_GOT_SERDES_FLOWCTL; | ||
2620 | current_link_up = 1; | 2617 | current_link_up = 1; |
2621 | } | 2618 | } |
2622 | for (i = 0; i < 30; i++) { | 2619 | for (i = 0; i < 30; i++) { |
@@ -2639,7 +2636,6 @@ static int tg3_setup_fiber_by_hand(struct tg3 *tp, u32 mac_status) | |||
2639 | } else { | 2636 | } else { |
2640 | /* Forcing 1000FD link up. */ | 2637 | /* Forcing 1000FD link up. */ |
2641 | current_link_up = 1; | 2638 | current_link_up = 1; |
2642 | tp->tg3_flags |= TG3_FLAG_GOT_SERDES_FLOWCTL; | ||
2643 | 2639 | ||
2644 | tw32_f(MAC_MODE, (tp->mac_mode | MAC_MODE_SEND_CONFIGS)); | 2640 | tw32_f(MAC_MODE, (tp->mac_mode | MAC_MODE_SEND_CONFIGS)); |
2645 | udelay(40); | 2641 | udelay(40); |
@@ -7400,9 +7396,7 @@ static int tg3_close(struct net_device *dev) | |||
7400 | 7396 | ||
7401 | tg3_halt(tp, RESET_KIND_SHUTDOWN, 1); | 7397 | tg3_halt(tp, RESET_KIND_SHUTDOWN, 1); |
7402 | tg3_free_rings(tp); | 7398 | tg3_free_rings(tp); |
7403 | tp->tg3_flags &= | 7399 | tp->tg3_flags &= ~TG3_FLAG_INIT_COMPLETE; |
7404 | ~(TG3_FLAG_INIT_COMPLETE | | ||
7405 | TG3_FLAG_GOT_SERDES_FLOWCTL); | ||
7406 | 7400 | ||
7407 | tg3_full_unlock(tp); | 7401 | tg3_full_unlock(tp); |
7408 | 7402 | ||