From 2120bfd082832d9b97c0a4014c7b3b33b2d85f30 Mon Sep 17 00:00:00 2001
From: Vasiliy Kulikov <segooon@gmail.com>
Date: Tue, 28 Sep 2010 21:07:55 +0400
Subject: [PATCH] --- yaml --- r: 220002 b: refs/heads/master c:
 8db3271cb24d4298e39a249c4dd966b189b05e97 h: refs/heads/master v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/staging/ath6kl/os/linux/ar6000_drv.c | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 4c1fc17cc37e..d584fcddbda5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2166abebc55843409327ddf6cc424cafadd33a30
+refs/heads/master: 8db3271cb24d4298e39a249c4dd966b189b05e97
diff --git a/trunk/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/trunk/drivers/staging/ath6kl/os/linux/ar6000_drv.c
index daba6e4cb9d8..c5a6d6c16735 100644
--- a/trunk/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+++ b/trunk/drivers/staging/ath6kl/os/linux/ar6000_drv.c
@@ -2143,11 +2143,7 @@ ar6000_destroy(struct net_device *dev, unsigned int unregister)
         unregister_netdev(dev);
         is_netdev_registered = 0;
     }
-#ifndef free_netdev
-    kfree(dev);
-#else
     free_netdev(dev);
-#endif
 
 #ifdef ATH6K_CONFIG_CFG80211
     ar6k_cfg80211_deinit(ar);
@@ -6429,11 +6425,7 @@ A_STATUS ar6000_remove_ap_interface(AR_SOFTC_T *ar)
         ar6000_stop_ap_interface(ar);
 
         unregister_netdev(arApNetDev);
-#ifndef free_netdev
-        kfree(arApNetDev);
-#else
         free_netdev(apApNetDev);
-#endif
 
         A_PRINTF("Remove AP interface\n");
     }