From: proski <proski@0192ed92-7a03-0410-a25b-9323aeb14dbd>
Date: Fri, 7 Oct 2011 21:30:59 +0000 (+0000)
Subject: Eliminate ATH_GET_NETDEV_DEV, it breaks on some CentOS kernels
X-Git-Url: http://git.ozo.com/?p=madwifi%2F.git;a=commitdiff_plain;h=afdc1e0da1792c67f9fa8213a6eff8e535405910

Eliminate ATH_GET_NETDEV_DEV, it breaks on some CentOS kernels

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

diff --git a/ath/if_ath.c b/ath/if_ath.c
index 5eacfc4..eb30927 100644
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -1493,7 +1493,9 @@ ath_vap_create(struct ieee80211com *ic, const char *name,
 	}
 	if (sc->sc_hastsfadd)
 		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 */
 	(void) ieee80211_vap_attach(vap,
 		ieee80211_media_change, ieee80211_media_status);
diff --git a/ath/if_athvar.h b/ath/if_athvar.h
index afafc23..6f44db6 100644
--- a/ath/if_athvar.h
+++ b/ath/if_athvar.h
@@ -125,12 +125,6 @@ typedef void irqreturn_t;
 #define	SET_NETDEV_DEV(ndev, pdev)
 #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)
 static inline struct net_device *_alloc_netdev(int sizeof_priv, const char *mask,
 					       void (*setup)(struct net_device *))