aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/igbvf/netdev.c
diff options
context:
space:
mode:
authorEmil Tantilov <emil.s.tantilov@intel.com>2010-10-28 00:59:51 +0000
committerDavid S. Miller <davem@davemloft.net>2010-10-28 10:19:01 -0700
commitde7fe7874dc55e8226245c50f07dec3c7b285044 (patch)
tree9b44d5b477917a8742bbc3382409754fec797edd /drivers/net/igbvf/netdev.c
parentec43a81cfa85b1ba0c9ac1aa995fe652f30fd4d6 (diff)
downloadkernel_samsung_smdk4412-de7fe7874dc55e8226245c50f07dec3c7b285044.zip
kernel_samsung_smdk4412-de7fe7874dc55e8226245c50f07dec3c7b285044.tar.gz
kernel_samsung_smdk4412-de7fe7874dc55e8226245c50f07dec3c7b285044.tar.bz2
igbvf: fix panic on load
Introduced by commit:e6484930d7c73d324bccda7d43d131088da697b9 net: allocate tx queues in register_netdevice Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com> Acked-by: Greg Rose <greg.v.rose@intel.com> Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/igbvf/netdev.c')
-rw-r--r--drivers/net/igbvf/netdev.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c
index ebfaa68..28af019 100644
--- a/drivers/net/igbvf/netdev.c
+++ b/drivers/net/igbvf/netdev.c
@@ -2783,15 +2783,15 @@ static int __devinit igbvf_probe(struct pci_dev *pdev,
/* reset the hardware with the new settings */
igbvf_reset(adapter);
- /* tell the stack to leave us alone until igbvf_open() is called */
- netif_carrier_off(netdev);
- netif_stop_queue(netdev);
-
strcpy(netdev->name, "eth%d");
err = register_netdev(netdev);
if (err)
goto err_hw_init;
+ /* tell the stack to leave us alone until igbvf_open() is called */
+ netif_carrier_off(netdev);
+ netif_stop_queue(netdev);
+
igbvf_print_device_info(adapter);
igbvf_initialize_last_counter_stats(adapter);