diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2013-08-16 18:15:49 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-08-22 14:30:25 -0400 |
commit | 91a3fa39ddf2f85a15cb20ccc3a54c1f0497af1e (patch) | |
tree | 3589e840381bf45d07d2925b8bb706cf41fbdf24 | |
parent | 69b307a48a5e10d5fd53dbbfae1c700da356bd5d (diff) |
rt2x00: rt2800: rename HW_BEACON_OFFSET macro
The name of the HW_BEACON_OFFSET macro is a
bit confusing. It returns with one of the
HW_BEACON_BASE* values, so rename the macro
to HW_BEACON_BASE to reflect that.
The patch contains no functional changes.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800lib.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h index a3132414ac9f..6e69b961909f 100644 --- a/drivers/net/wireless/rt2x00/rt2800.h +++ b/drivers/net/wireless/rt2x00/rt2800.h | |||
@@ -2019,7 +2019,7 @@ struct mac_iveiv_entry { | |||
2019 | #define HW_BEACON_BASE6 0x5dc0 | 2019 | #define HW_BEACON_BASE6 0x5dc0 |
2020 | #define HW_BEACON_BASE7 0x5bc0 | 2020 | #define HW_BEACON_BASE7 0x5bc0 |
2021 | 2021 | ||
2022 | #define HW_BEACON_OFFSET(__index) \ | 2022 | #define HW_BEACON_BASE(__index) \ |
2023 | (((__index) < 4) ? (HW_BEACON_BASE0 + (__index * 0x0200)) : \ | 2023 | (((__index) < 4) ? (HW_BEACON_BASE0 + (__index * 0x0200)) : \ |
2024 | (((__index) < 6) ? (HW_BEACON_BASE4 + ((__index - 4) * 0x0200)) : \ | 2024 | (((__index) < 6) ? (HW_BEACON_BASE4 + ((__index - 4) * 0x0200)) : \ |
2025 | (HW_BEACON_BASE6 - ((__index - 6) * 0x0200)))) | 2025 | (HW_BEACON_BASE6 - ((__index - 6) * 0x0200)))) |
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index 313da6ac2ee4..704fcfbca06b 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c | |||
@@ -992,7 +992,7 @@ void rt2800_write_beacon(struct queue_entry *entry, struct txentry_desc *txdesc) | |||
992 | return; | 992 | return; |
993 | } | 993 | } |
994 | 994 | ||
995 | beacon_base = HW_BEACON_OFFSET(entry->entry_idx); | 995 | beacon_base = HW_BEACON_BASE(entry->entry_idx); |
996 | rt2800_register_multiwrite(rt2x00dev, beacon_base, entry->skb->data, | 996 | rt2800_register_multiwrite(rt2x00dev, beacon_base, entry->skb->data, |
997 | entry->skb->len + padding_len); | 997 | entry->skb->len + padding_len); |
998 | 998 | ||
@@ -1042,7 +1042,7 @@ void rt2800_clear_beacon(struct queue_entry *entry) | |||
1042 | * Clear beacon. | 1042 | * Clear beacon. |
1043 | */ | 1043 | */ |
1044 | rt2800_clear_beacon_register(rt2x00dev, | 1044 | rt2800_clear_beacon_register(rt2x00dev, |
1045 | HW_BEACON_OFFSET(entry->entry_idx)); | 1045 | HW_BEACON_BASE(entry->entry_idx)); |
1046 | 1046 | ||
1047 | /* | 1047 | /* |
1048 | * Enabled beaconing again. | 1048 | * Enabled beaconing again. |