From 416e83505de68e20a207f3fc79e2d56efd03abe9 Mon Sep 17 00:00:00 2001 From: Greg Rose Date: Tue, 16 Nov 2010 19:27:19 -0800 Subject: [PATCH] --- yaml --- r: 224396 b: refs/heads/master c: 5d426ad1af31ac27d7c2222f20eec9d0a8aeac42 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbevf/ixgbevf_main.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 32d4dc0619d0..fd0f927336d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2ddeba95c09d0d44719ff005e915dc06ff46571 +refs/heads/master: 5d426ad1af31ac27d7c2222f20eec9d0a8aeac42 diff --git a/trunk/drivers/net/ixgbevf/ixgbevf_main.c b/trunk/drivers/net/ixgbevf/ixgbevf_main.c index 1d7de555e630..5b8063cb4e6c 100644 --- a/trunk/drivers/net/ixgbevf/ixgbevf_main.c +++ b/trunk/drivers/net/ixgbevf/ixgbevf_main.c @@ -3425,10 +3425,6 @@ static int __devinit ixgbevf_probe(struct pci_dev *pdev, if (hw->mac.ops.get_bus_info) hw->mac.ops.get_bus_info(hw); - - netif_carrier_off(netdev); - netif_tx_stop_all_queues(netdev); - strcpy(netdev->name, "eth%d"); err = register_netdev(netdev); @@ -3437,6 +3433,8 @@ static int __devinit ixgbevf_probe(struct pci_dev *pdev, adapter->netdev_registered = true; + netif_carrier_off(netdev); + ixgbevf_init_last_counter_stats(adapter); /* print the MAC address */