From d033f54b5cd733e8e3062737c5c3d2b09b115149 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Mon, 4 Jul 2005 00:22:53 +0200 Subject: [PATCH] --- yaml --- r: 5886 b: refs/heads/master c: a4cf0761493495681d72dcc0b34efb86e94a5527 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/8139cp.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2ec8ba311018..59a82546bc85 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 852ea22ab24df4c64c0211c3b6d6358eb0e759f9 +refs/heads/master: a4cf0761493495681d72dcc0b34efb86e94a5527 diff --git a/trunk/drivers/net/8139cp.c b/trunk/drivers/net/8139cp.c index 7b293f01c9ed..34b80de34fae 100644 --- a/trunk/drivers/net/8139cp.c +++ b/trunk/drivers/net/8139cp.c @@ -1897,6 +1897,7 @@ static int cp_resume (struct pci_dev *pdev) { struct net_device *dev; struct cp_private *cp; + unsigned long flags; dev = pci_get_drvdata (pdev); cp = netdev_priv(dev); @@ -1910,6 +1911,12 @@ static int cp_resume (struct pci_dev *pdev) cp_init_hw (cp); netif_start_queue (dev); + + spin_lock_irqsave (&cp->lock, flags); + + mii_check_media(&cp->mii_if, netif_msg_link(cp), FALSE); + + spin_unlock_irqrestore (&cp->lock, flags); return 0; }