summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorWu Fengguang <fengguang.wu@intel.com>2008-12-03 00:19:04 -0800
committerJohn W. Linville <linville@tuxdriver.com>2008-12-05 09:35:56 -0500
commit4c7f0bc266ccccfb0ca397405af13ee3d9e0f6b2 (patch)
tree4fda80914123923db1fd97a594ff0f568cadac39 /drivers
parent74415edb042ef9f3b1291f978763687f35aadbb3 (diff)
downloadop-kernel-dev-4c7f0bc266ccccfb0ca397405af13ee3d9e0f6b2.zip
op-kernel-dev-4c7f0bc266ccccfb0ca397405af13ee3d9e0f6b2.tar.gz
generic swap(): ath9k: rename swap() to swap_array()
In preparation for the introduction of a generic swap() macro. Signed-off-by: Wu Fengguang <fengguang.wu@intel.com> Cc: Sujith Manoharan <Sujith.Manoharan@atheros.com> Cc: Luis R. Rodriguez <lrodriguez@atheros.com> Cc: Vasanthakumar Thiagarajan <vasanth@atheros.com> Cc: Senthil Balasubramanian <senthilkumar@atheros.com> Cc: Jouni Malinen <jouni.malinen@atheros.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ath9k/regd.c2
-rw-r--r--drivers/net/wireless/ath9k/regd.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath9k/regd.c b/drivers/net/wireless/ath9k/regd.c
index 42ce1d9..64043e9 100644
--- a/drivers/net/wireless/ath9k/regd.c
+++ b/drivers/net/wireless/ath9k/regd.c
@@ -42,7 +42,7 @@ ath9k_regd_sort(void *a, u32 n, u32 size, ath_hal_cmp_t *cmp)
u8 *u = t - size;
if (cmp(u, t) <= 0)
break;
- swap(u, t, size);
+ swap_array(u, t, size);
}
}
diff --git a/drivers/net/wireless/ath9k/regd.h b/drivers/net/wireless/ath9k/regd.h
index 0ecd344..512d990 100644
--- a/drivers/net/wireless/ath9k/regd.h
+++ b/drivers/net/wireless/ath9k/regd.h
@@ -125,7 +125,7 @@
#define CHAN_FLAGS (CHANNEL_ALL|CHANNEL_HALF|CHANNEL_QUARTER)
-#define swap(_a, _b, _size) { \
+#define swap_array(_a, _b, _size) { \
u8 *s = _b; \
int i = _size; \
do { \
OpenPOWER on IntegriCloud