Commit 69dcfc8a authored by Nishanth Aravamudan's avatar Nishanth Aravamudan Committed by David S. Miller

cxgb3: fix crash due to manipulating queues before registration

Along the same lines as "cxgb4: fix crash due to manipulating queues
before registration" (8f6d9f40), before
commit "net: allocate tx queues in register_netdevice"
netif_tx_stop_all_queues and related functions could be used between
device allocation and registration but now only after registration.
cxgb4 has such a call before registration and crashes now.  Move it
after register_netdev.
Signed-off-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Cc: eric.dumazet@gmail.com
Cc: sonnyrao@us.ibm.com
Cc: Divy Le Ray <divy@chelsio.com>
Cc: Dimitris Michailidis <dm@chelsio.com>
Cc: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Tested-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Acked-by: default avatarDivy Le Ray <divy@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b7126d8c
...@@ -3301,7 +3301,6 @@ static int __devinit init_one(struct pci_dev *pdev, ...@@ -3301,7 +3301,6 @@ static int __devinit init_one(struct pci_dev *pdev,
pi->rx_offload = T3_RX_CSUM | T3_LRO; pi->rx_offload = T3_RX_CSUM | T3_LRO;
pi->port_id = i; pi->port_id = i;
netif_carrier_off(netdev); netif_carrier_off(netdev);
netif_tx_stop_all_queues(netdev);
netdev->irq = pdev->irq; netdev->irq = pdev->irq;
netdev->mem_start = mmio_start; netdev->mem_start = mmio_start;
netdev->mem_end = mmio_start + mmio_len - 1; netdev->mem_end = mmio_start + mmio_len - 1;
...@@ -3342,6 +3341,7 @@ static int __devinit init_one(struct pci_dev *pdev, ...@@ -3342,6 +3341,7 @@ static int __devinit init_one(struct pci_dev *pdev,
adapter->name = adapter->port[i]->name; adapter->name = adapter->port[i]->name;
__set_bit(i, &adapter->registered_device_map); __set_bit(i, &adapter->registered_device_map);
netif_tx_stop_all_queues(adapter->port[i]);
} }
} }
if (!adapter->registered_device_map) { if (!adapter->registered_device_map) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment