ath6kl: move setting netdev for non-cf80211 case

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@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Luis R. Rodriguez 2011-03-29 17:56:03 -07:00 committed by Greg Kroah-Hartman
parent 8f05c5b940
commit 1fd8d02467

View File

@ -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;