diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-11-27 22:06:27 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-11-27 22:06:27 +0000 |
commit | 617e6409e74adfc2b9c9856479dec814ed7b5c7b (patch) | |
tree | 8ce878bed5b50ca59448dc71aa9c04d9c14a15ae /package/madwifi/patches/128-revert_ioaccess.patch | |
parent | 83af9038b78d6b9a71c978d9bc9ded8633ebe605 (diff) |
update to latest madwifi snapshot - fixes some noderef bugs
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9602 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/madwifi/patches/128-revert_ioaccess.patch')
-rw-r--r-- | package/madwifi/patches/128-revert_ioaccess.patch | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/package/madwifi/patches/128-revert_ioaccess.patch b/package/madwifi/patches/128-revert_ioaccess.patch deleted file mode 100644 index 987515bfa..000000000 --- a/package/madwifi/patches/128-revert_ioaccess.patch +++ /dev/null @@ -1,59 +0,0 @@ -Index: madwifi-ng-r2834-20071106/ath_hal/ah_os.h -=================================================================== ---- madwifi-ng-r2834-20071106.orig/ath_hal/ah_os.h 2007-11-07 14:01:59.257328552 +0100 -+++ madwifi-ng-r2834-20071106/ath_hal/ah_os.h 2007-11-07 14:02:04.329617605 +0100 -@@ -172,44 +172,25 @@ - * never byte-swapped by PCI chipsets or bridges, but always - * written directly (i.e. the format defined by the manufacturer). - */ --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12) --# if (AH_BYTE_ORDER == AH_BIG_ENDIAN) -+#if (AH_BYTE_ORDER == AH_BIG_ENDIAN) - #define _OS_REG_WRITE(_ah, _reg, _val) do { \ - (0x4000 <= (_reg) && (_reg) < 0x5000) ? \ -- iowrite32((_val), (_ah)->ah_sh + (_reg)) : \ -- iowrite32be((_val), (_ah)->ah_sh + (_reg)); \ -- } while (0) --#define _OS_REG_READ(_ah, _reg) \ -- ((0x4000 <= (_reg) && (_reg) < 0x5000) ? \ -- ioread32((_ah)->ah_sh + (_reg)) : \ -- ioread32be((_ah)->ah_sh + (_reg))); --# else /* AH_LITTLE_ENDIAN */ --#define _OS_REG_WRITE(_ah, _reg, _val) do { \ -- iowrite32(_val, (_ah)->ah_sh + (_reg)); \ -- } while (0) --#define _OS_REG_READ(_ah, _reg) \ -- ioread32((_ah)->ah_sh + (_reg)) -- --# endif /* AH_BYTE_ORDER */ --#else --# if (AH_BYTE_ORDER == AH_BIG_ENDIAN) --#define _OS_REG_WRITE(_ah, _reg, _val) do { \ -- writel((0x4000 <= (_reg) && (_reg) < 0x5000) ? \ -- (_val) : cpu_to_le32(_val), \ -- (_ah)->ah_sh + (_reg)); \ -- } while (0) -+ writel((_val), (_ah)->ah_sh + (_reg)) : \ -+ ({__raw_writel((_val), (_ah)->ah_sh + (_reg)); \ -+ mb(); }); \ -+} while (0) - #define _OS_REG_READ(_ah, _reg) \ - ((0x4000 <= (_reg) && (_reg) < 0x5000) ? \ - readl((_ah)->ah_sh + (_reg)) : \ -- cpu_to_le32(readl((_ah)->ah_sh + (_reg)))) --# else /* AH_LITTLE_ENDIAN */ -+ ({unsigned long __v = __raw_readl((_ah)->ah_sh + \ -+ (_reg)); mb(); __v; })) -+#else /* AH_LITTLE_ENDIAN */ - #define _OS_REG_WRITE(_ah, _reg, _val) do { \ - writel(_val, (_ah)->ah_sh + (_reg)); \ -- } while (0) -+} while (0) - #define _OS_REG_READ(_ah, _reg) \ - readl((_ah)->ah_sh + (_reg)) --# endif /* AH_BYTE_ORDER */ --#endif /* KERNEL_VERSON(2,6,12) */ -+#endif /* AH_BYTE_ORDER */ - - /* - The functions in this section are not intended to be invoked by MadWifi driver |