From 0c70d45c023db8752b38db721d630497bfc52d85 Mon Sep 17 00:00:00 2001
From: Roland Dreier <rolandd@cisco.com>
Date: Tue, 9 May 2006 22:54:59 -0700
Subject: [PATCH] --- yaml --- r: 26601 b: refs/heads/master c:
 5941d079f2c3bdf0dffed1afb8941678fcd0bcb7 h: refs/heads/master i:   26599:
 f739604405fca6d00e2e8b8e98d099ba24188698 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 92f498b76225..98cddada8afa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3285aa4eecd722508dab01c4932b11b4ba80134
+refs/heads/master: 5941d079f2c3bdf0dffed1afb8941678fcd0bcb7
diff --git a/trunk/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/trunk/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
index 4ca175553f9f..f887780e8093 100644
--- a/trunk/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
+++ b/trunk/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;