diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-10 15:37:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-10 15:37:47 -0700 |
| commit | 0e44dc383787b472a7f13564c6bd8a44cc07d408 (patch) | |
| tree | e7d49fa04f93dec589c1fa8ffb1b129b1b92a0f9 /drivers/infiniband/ulp/ipoib/ipoib_vlan.c | |
| parent | 6314410dd1e9db1c0009b0f7b56cc771a4d1e85a (diff) | |
| parent | ce477ae4f8c75c94587c3157deffad8219db09a0 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/mthca: FMR ioremap fix
IPoIB: Free child interfaces properly
IB/mthca: Fix race in reference counting
IB/srp: Fix tracking of pending requests during error handling
IB: Fix display of 4-bit port counters in sysfs
Diffstat (limited to 'drivers/infiniband/ulp/ipoib/ipoib_vlan.c')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c index 4ca175553f9..f887780e809 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c @@ -158,10 +158,8 @@ 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); - - kfree(priv); + free_netdev(priv->dev); ret = 0; break; |