From 03d7260855b50411c0548e9e17b59eb907e62f1e Mon Sep 17 00:00:00 2001 From: Sathya Perla Date: Tue, 2 Aug 2011 19:57:41 +0000 Subject: [PATCH] --- yaml --- r: 265178 b: refs/heads/master c: d09f698056a33c8b078497fb23e3304b6f8a908f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/benet/be_main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5898824c6f2a..8d973b6f0d57 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9b3cd7f323b2e57593e7215362a7b02fc933e3a +refs/heads/master: d09f698056a33c8b078497fb23e3304b6f8a908f diff --git a/trunk/drivers/net/benet/be_main.c b/trunk/drivers/net/benet/be_main.c index 9f2f66c66be6..553cc0dc6c91 100644 --- a/trunk/drivers/net/benet/be_main.c +++ b/trunk/drivers/net/benet/be_main.c @@ -2217,7 +2217,6 @@ static int be_close(struct net_device *netdev) be_async_mcc_disable(adapter); - netif_carrier_off(netdev); adapter->link_up = false; if (!lancer_chip(adapter)) @@ -3345,7 +3344,6 @@ static int __devinit be_probe(struct pci_dev *pdev, status = register_netdev(netdev); if (status != 0) goto unsetup; - netif_carrier_off(netdev); if (be_physfn(adapter) && adapter->sriov_enabled) { u8 mac_speed;