git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
infiniband
/
ulp
/
ipoib
/
ipoib_vlan.c
diff --git
a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
index
f887780
..
4ca1755
100644
(file)
--- a/
drivers/infiniband/ulp/ipoib/ipoib_vlan.c
+++ b/
drivers/infiniband/ulp/ipoib/ipoib_vlan.c
@@
-158,8
+158,10
@@
int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey)
if (priv->pkey == pkey) {
unregister_netdev(priv->dev);
ipoib_dev_cleanup(priv->dev);
+
list_del(&priv->list);
- free_netdev(priv->dev);
+
+ kfree(priv);
ret = 0;
break;