[PATCH 06/34] ath6kl: move setting netdev for non-cf80211 case
Luis R. Rodriguez
lrodriguez at atheros.com
Wed Mar 30 00:56:03 UTC 2011
The check for SET_NETDEV_DEV is not required given that
this is upstream. The setting of the SET_NETDEV_DEV with
the osDevInfo.pOSDevice is redundant for the cfg80211 case
as this was already being done, so just set the netdev device
for the non-cfg80211 which was missing.
Cc: Naveen Singh <nsingh at atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez at atheros.com>
---
drivers/staging/ath6kl/os/linux/ar6000_drv.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
index bb4dbb5..94b9132 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+++ b/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;
--
1.7.0.4
More information about the devel
mailing list