diff --git a/[refs] b/[refs]
index c60eab6b22d4..4fc8299519d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f05c5b940f3c08d30f4298ceb7cc076dd444008
+refs/heads/master: 1fd8d02467606a3f69118b495f6ff5dfb9749422
diff --git a/trunk/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/trunk/drivers/staging/ath6kl/os/linux/ar6000_drv.c
index bb4dbb52cbc2..94b913260349 100644
--- a/trunk/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+++ b/trunk/drivers/staging/ath6kl/os/linux/ar6000_drv.c
@@ -1685,6 +1685,7 @@ ar6000_avail_ev(void *context, void *hif_handle)
     }
     ether_setup(dev);
     ar_netif = ar6k_priv(dev);
+    SET_NETDEV_DEV(dev, osDevInfo.pOSDevice);
 #endif /* ATH6K_CONFIG_CFG80211 */
 
     if (ar_netif == NULL) {
@@ -1715,11 +1716,6 @@ ar6000_avail_ev(void *context, void *hif_handle)
 
     init_netdev(dev, ifname);
 
-#ifdef SET_NETDEV_DEV
-    if (ar_netif) { 
-        SET_NETDEV_DEV(dev, osDevInfo.pOSDevice);
-    }
-#endif 
 
     ar->arNetDev             = dev;
     ar->arHifDevice          = hif_handle;