diff options
author | Emil Tantilov <emil.s.tantilov@intel.com> | 2010-10-27 20:59:51 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-10-28 13:19:01 -0400 |
commit | de7fe7874dc55e8226245c50f07dec3c7b285044 (patch) | |
tree | 9b44d5b477917a8742bbc3382409754fec797edd /drivers/net/igbvf | |
parent | ec43a81cfa85b1ba0c9ac1aa995fe652f30fd4d6 (diff) |
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')
-rw-r--r-- | drivers/net/igbvf/netdev.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c index ebfaa68ee630..28af019c97bb 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, | |||
2783 | /* reset the hardware with the new settings */ | 2783 | /* reset the hardware with the new settings */ |
2784 | igbvf_reset(adapter); | 2784 | igbvf_reset(adapter); |
2785 | 2785 | ||
2786 | /* tell the stack to leave us alone until igbvf_open() is called */ | ||
2787 | netif_carrier_off(netdev); | ||
2788 | netif_stop_queue(netdev); | ||
2789 | |||
2790 | strcpy(netdev->name, "eth%d"); | 2786 | strcpy(netdev->name, "eth%d"); |
2791 | err = register_netdev(netdev); | 2787 | err = register_netdev(netdev); |
2792 | if (err) | 2788 | if (err) |
2793 | goto err_hw_init; | 2789 | goto err_hw_init; |
2794 | 2790 | ||
2791 | /* tell the stack to leave us alone until igbvf_open() is called */ | ||
2792 | netif_carrier_off(netdev); | ||
2793 | netif_stop_queue(netdev); | ||
2794 | |||
2795 | igbvf_print_device_info(adapter); | 2795 | igbvf_print_device_info(adapter); |
2796 | 2796 | ||
2797 | igbvf_initialize_last_counter_stats(adapter); | 2797 | igbvf_initialize_last_counter_stats(adapter); |