diff options
| author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2008-04-21 12:48:58 -0700 |
|---|---|---|
| committer | Luis R. Rodriguez <lrodriguez@atheros.com> | 2008-04-21 12:48:58 -0700 |
| commit | 2910f64b994e095076c0b4044f18b74959a0fb5c (patch) | |
| tree | bfb0a3ad4880279a6876aa488c6cbfa133ea6152 | |
| parent | 92f79dfe4cfe18ab8bc2175fff8b5248714fe08a (diff) | |
| download | compat-wireless-2.6-old-2910f64b994e095076c0b4044f18b74959a0fb5c.tar.gz | |
Add new pcie compat fix as a new patch was added upstream
which makes use of is_pcie.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
| -rw-r--r-- | compat/compat.diff | 64 |
1 files changed, 38 insertions, 26 deletions
diff --git a/compat/compat.diff b/compat/compat.diff index acc5837..00e7804 100644 --- a/compat/compat.diff +++ b/compat/compat.diff @@ -797,32 +797,6 @@ enum { IEEE80211_RX_MSG = 1, ---- a/drivers/net/wireless/ath5k/hw.c 2008-04-21 10:48:09.000000000 -0700 -+++ b/drivers/net/wireless/ath5k/hw.c 2008-04-21 10:48:09.000000000 -0700 -@@ -490,7 +490,11 @@ - /* reseting PCI on PCI-E cards results card to hang - * and always return 0xffff... so we ingore that flag - * for PCI-E cards */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) -+ bus_flags = (compat_is_pcie(pdev)) ? 0 : AR5K_RESET_CTL_PCI; -+#else - bus_flags = (pdev->is_pcie) ? 0 : AR5K_RESET_CTL_PCI; -+#endif - - /* Reset chipset */ - ret = ath5k_hw_nic_reset(ah, AR5K_RESET_CTL_PCU | -@@ -1043,7 +1047,11 @@ - * TODO: Check out tx triger level, it's always 64 on dumps but I - * guess we can tweak it and see how it goes ;-) - */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) -+ dma_size = (compat_is_pcie(pdev)) ? AR5K_DMASIZE_128B : AR5K_DMASIZE_512B; -+#else - dma_size = (pdev->is_pcie) ? AR5K_DMASIZE_128B : AR5K_DMASIZE_512B; -+#endif - if (ah->ah_version != AR5K_AR5210) { - AR5K_REG_WRITE_BITS(ah, AR5K_TXCFG, - AR5K_TXCFG_SDMAMR, dma_size); --- a/net/mac80211/main.c 2008-04-21 10:48:09.000000000 -0700 +++ b/net/mac80211/main.c 2008-04-21 10:48:09.000000000 -0700 @@ -21,7 +21,9 @@ @@ -872,3 +846,41 @@ mdev->set_multicast_list = ieee80211_master_set_multicast_list; sdata->vif.type = IEEE80211_IF_TYPE_AP; +--- a/drivers/net/wireless/ath5k/hw.c 2008-04-21 15:30:47.000000000 -0400 ++++ b/drivers/net/wireless/ath5k/hw.c 2008-04-21 15:33:37.000000000 -0400 +@@ -343,7 +343,11 @@ + * I guess these point to ClockReq but + * i'm not sure.) + */ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) ++ if ((ah->ah_version == AR5K_AR5212) && compat_is_pcie(pdev)) { ++#else + if ((ah->ah_version == AR5K_AR5212) && (pdev->is_pcie)) { ++#endif + ath5k_hw_reg_write(ah, 0x9248fc00, 0x4080); + ath5k_hw_reg_write(ah, 0x24924924, 0x4080); + ath5k_hw_reg_write(ah, 0x28000039, 0x4080); +@@ -490,7 +494,11 @@ + /* reseting PCI on PCI-E cards results card to hang + * and always return 0xffff... so we ingore that flag + * for PCI-E cards */ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) ++ bus_flags = (compat_is_pcie(pdev)) ? 0 : AR5K_RESET_CTL_PCI; ++#else + bus_flags = (pdev->is_pcie) ? 0 : AR5K_RESET_CTL_PCI; ++#endif + + /* Reset chipset */ + ret = ath5k_hw_nic_reset(ah, AR5K_RESET_CTL_PCU | +@@ -1043,7 +1051,11 @@ + * TODO: Check out tx triger level, it's always 64 on dumps but I + * guess we can tweak it and see how it goes ;-) + */ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) ++ dma_size = (compat_is_pcie(pdev)) ? AR5K_DMASIZE_128B : AR5K_DMASIZE_512B; ++#else + dma_size = (pdev->is_pcie) ? AR5K_DMASIZE_128B : AR5K_DMASIZE_512B; ++#endif + if (ah->ah_version != AR5K_AR5210) { + AR5K_REG_WRITE_BITS(ah, AR5K_TXCFG, + AR5K_TXCFG_SDMAMR, dma_size); |