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>

diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h
index a3132414ac9f4602454b1294d01c4f34dd01dbc3..6e69b961909f3673c3fe7ff95cd5715900cefb83 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
@@ -2019,7 +2019,7 @@ struct mac_iveiv_entry {
 #define HW_BEACON_BASE6                        0x5dc0
 #define HW_BEACON_BASE7                        0x5bc0
 
-#define HW_BEACON_OFFSET(__index) \
+#define HW_BEACON_BASE(__index) \
        (((__index) < 4) ? (HW_BEACON_BASE0 + (__index * 0x0200)) : \
          (((__index) < 6) ? (HW_BEACON_BASE4 + ((__index - 4) * 0x0200)) : \
          (HW_BEACON_BASE6 - ((__index - 6) * 0x0200))))

diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 313da6ac2ee4bc36fc32d1da4b1c84f208b3a626..704fcfbca06b195de6cc199629b68dfd9e3f8c62 100644 (file)
--- 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)
                return;
        }
 
-       beacon_base = HW_BEACON_OFFSET(entry->entry_idx);
+       beacon_base = HW_BEACON_BASE(entry->entry_idx);
        rt2800_register_multiwrite(rt2x00dev, beacon_base, entry->skb->data,
                                   entry->skb->len + padding_len);
 
@@ -1042,7 +1042,7 @@ void rt2800_clear_beacon(struct queue_entry *entry)
         * Clear beacon.
         */
        rt2800_clear_beacon_register(rt2x00dev,
-                                    HW_BEACON_OFFSET(entry->entry_idx));
+                                    HW_BEACON_BASE(entry->entry_idx));
 
        /*
         * Enabled beaconing again.