diff options
| author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2011-03-29 17:56:03 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-04 22:58:05 -0700 |
| commit | 1fd8d02467606a3f69118b495f6ff5dfb9749422 (patch) | |
| tree | 2168ce48696abd1e22d2f7ca416bed456d01c971 /drivers/staging/ath6kl | |
| parent | 8f05c5b940f3c08d30f4298ceb7cc076dd444008 (diff) | |
| download | op-kernel-dev-1fd8d02467606a3f69118b495f6ff5dfb9749422.zip op-kernel-dev-1fd8d02467606a3f69118b495f6ff5dfb9749422.tar.gz | |
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>
Diffstat (limited to 'drivers/staging/ath6kl')
| -rw-r--r-- | 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; |
