projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge v5.14-rc3 into usb-next
[linux-2.6-microblaze.git]
/
drivers
/
net
/
ethernet
/
chelsio
/
cxgb4
/
cxgb4_main.c
diff --git
a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index
9a2b166
..
dbf9a0e
100644
(file)
--- a/
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@
-2643,6
+2643,9
@@
static void detach_ulds(struct adapter *adap)
{
unsigned int i;
{
unsigned int i;
+ if (!is_uld(adap))
+ return;
+
mutex_lock(&uld_mutex);
list_del(&adap->list_node);
mutex_lock(&uld_mutex);
list_del(&adap->list_node);
@@
-7141,10
+7144,13
@@
static void remove_one(struct pci_dev *pdev)
*/
destroy_workqueue(adapter->workq);
*/
destroy_workqueue(adapter->workq);
- if (is_uld(adapter)) {
- detach_ulds(adapter);
- t4_uld_clean_up(adapter);
- }
+ detach_ulds(adapter);
+
+ for_each_port(adapter, i)
+ if (adapter->port[i]->reg_state == NETREG_REGISTERED)
+ unregister_netdev(adapter->port[i]);
+
+ t4_uld_clean_up(adapter);
adap_free_hma_mem(adapter);
adap_free_hma_mem(adapter);
@@
-7152,10
+7158,6
@@
static void remove_one(struct pci_dev *pdev)
cxgb4_free_mps_ref_entries(adapter);
cxgb4_free_mps_ref_entries(adapter);
- for_each_port(adapter, i)
- if (adapter->port[i]->reg_state == NETREG_REGISTERED)
- unregister_netdev(adapter->port[i]);
-
debugfs_remove_recursive(adapter->debugfs_root);
if (!is_t4(adapter->params.chip))
debugfs_remove_recursive(adapter->debugfs_root);
if (!is_t4(adapter->params.chip))