git.samba.org
/
jlayton
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[jlayton/linux.git]
/
drivers
/
net
/
ethernet
/
emulex
/
benet
/
be_main.c
diff --git
a/drivers/net/ethernet/emulex/benet/be_main.c
b/drivers/net/ethernet/emulex/benet/be_main.c
index db4ff14ff18f0adcffdcb2d8ca54b9e46f65f7c5..9cdeda54674aed9a2765454a327901d2733c6d2c 100644
(file)
--- a/
drivers/net/ethernet/emulex/benet/be_main.c
+++ b/
drivers/net/ethernet/emulex/benet/be_main.c
@@
-5014,6
+5014,7
@@
static void be_shutdown(struct pci_dev *pdev)
if (!adapter)
return;
+ be_roce_dev_shutdown(adapter);
cancel_delayed_work_sync(&adapter->work);
cancel_delayed_work_sync(&adapter->func_recovery_work);