summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-05-17 02:07:25 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-05-17 02:07:25 +0400
commit896821657479905b95d5193595b81679155ce199 (patch)
treee8462a545d28e175d4e3475469d02764a1f1b269 /drivers/net
parente2a978ec72cffe4739f5ef7618961d6a6209fa66 (diff)
parent8b19d450ad188d402a183ff4a4d40f31c3916fbf (diff)
downloadlinux-896821657479905b95d5193595b81679155ce199.tar.xz
Merge tag 'ntb-bugfixes-3.10' of git://github.com/jonmason/ntb
Pull NTB update from Jon Mason: "NTB bug fixes to address Smatch/Coverity errors, link toggling bugs, and a few corner cases in the driver." This pull request came in during the merge window, but without any signage etc. So I'm taking it late, because it wasn't _originally_ late. * tag 'ntb-bugfixes-3.10' of git://github.com/jonmason/ntb: NTB: Multiple NTB client fix ntb_netdev: remove from list on exit NTB: memcpy lockup workaround NTB: Correctly handle receive buffers of the minimal size NTB: reset tx_index on link toggle NTB: Link toggle memory leak NTB: Handle 64bit BAR sizes NTB: fix pointer math issues ntb: off by one sanity checks NTB: variable dereferenced before check
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ntb_netdev.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ntb_netdev.c b/drivers/net/ntb_netdev.c
index ed947dd76fbd..f3cdf64997d6 100644
--- a/drivers/net/ntb_netdev.c
+++ b/drivers/net/ntb_netdev.c
@@ -375,6 +375,8 @@ static void ntb_netdev_remove(struct pci_dev *pdev)
if (dev == NULL)
return;
+ list_del(&dev->list);
+
ndev = dev->ndev;
unregister_netdev(ndev);