Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 248991
b: refs/heads/master
c: 1fd8d02
h: refs/heads/master
i:
  248989: 8c4db4f
  248987: fd87442
  248983: 31cba48
  248975: 7bf24ef
  248959: 5ae7444
v: v3
  • Loading branch information
Luis R. Rodriguez authored and Greg Kroah-Hartman committed Apr 5, 2011
1 parent 4039fc0 commit e1a9ddf
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8f05c5b940f3c08d30f4298ceb7cc076dd444008
refs/heads/master: 1fd8d02467606a3f69118b495f6ff5dfb9749422
6 changes: 1 addition & 5 deletions trunk/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 e1a9ddf

Please sign in to comment.