Skip to content

Commit

Permalink
ath6kl: move setting netdev for non-cf80211 case
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Luis R. Rodriguez authored and Greg Kroah-Hartman committed Apr 5, 2011
1 parent 8f05c5b commit 1fd8d02
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions drivers/staging/ath6kl/os/linux/ar6000_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 1fd8d02

Please sign in to comment.