mirrors/madwifi
1
0
Fork 0
mirror of https://github.com/proski/madwifi synced 2024-11-21 22:11:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate ATH_GET_NETDEV_DEV, it breaks on some CentOS kernels

Browse Source 
Instead, use sc->sc_bdev to find the physical device.  sc->sc_bdev is
NULL on AHB and we don't use SET_NETDEV_DEV on AHB anyway, so do it on
PCI only.


git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@4170 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
proski 2011-10-07 21:30:59 +00:00
parent bd86fad851
commit afdc1e0da1
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ath/if_ath.c
View File

@ -1493,7 +1493,9 @@ ath_vap_create(struct ieee80211com *ic, const char *name,
} }
if (sc->sc_hastsfadd) if (sc->sc_hastsfadd)
ath_hal_settsfadjust(sc->sc_ah, sc->sc_stagbeacons); ath_hal_settsfadjust(sc->sc_ah, sc->sc_stagbeacons);
SET_NETDEV_DEV(dev, ATH_GET_NETDEV_DEV(mdev)); #ifdef ATH_PCI
SET_NETDEV_DEV(dev, &((struct pci_dev *)sc->sc_bdev)->dev);
#endif
/* complete setup */ /* complete setup */
(void) ieee80211_vap_attach(vap, (void) ieee80211_vap_attach(vap,
ieee80211_media_change, ieee80211_media_status); ieee80211_media_change, ieee80211_media_status);

6
ath/if_athvar.h
View File

@ -125,12 +125,6 @@ typedef void irqreturn_t;
#define SET_NETDEV_DEV(ndev, pdev) #define SET_NETDEV_DEV(ndev, pdev)
#endif #endif
#ifdef to_net_dev
#define ATH_GET_NETDEV_DEV(ndev) ((ndev)->dev.parent)
#else
#define ATH_GET_NETDEV_DEV(ndev) ((ndev)->class_dev.dev)
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23) #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23)
static inline struct net_device *_alloc_netdev(int sizeof_priv, const char *mask, static inline struct net_device *_alloc_netdev(int sizeof_priv, const char *mask,
void (*setup)(struct net_device *)) void (*setup)(struct net_device *))