summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2013-02-14 07:13:41 -0500
committerDavid S. Miller <davem@davemloft.net>2013-02-15 14:02:59 -0500
commit402e1398a398009d82731ec433220e172be4c7af (patch)
tree80df6fbd8de7bf37519cafb87a955127f554c09e
parentc5d0b72e641340c5dc915cdfab5e2c55d81425c2 (diff)
tg3: Set initial carrier state to off.
Before the device is opened, the carrier state should be off. It will not race with the link interrupt if we set it before calling register_netdev(). Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/broadcom/tg3.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 7ac0bd008738..3829321cec54 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -16902,6 +16902,8 @@ static int tg3_init_one(struct pci_dev *pdev,
16902 16902
16903 tg3_timer_init(tp); 16903 tg3_timer_init(tp);
16904 16904
16905 tg3_carrier_off(tp);
16906
16905 err = register_netdev(dev); 16907 err = register_netdev(dev);
16906 if (err) { 16908 if (err) {
16907 dev_err(&pdev->dev, "Cannot register net device, aborting\n"); 16909 dev_err(&pdev->dev, "Cannot register net device, aborting\n");