Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91a3fa39 authored by Gabor Juhos's avatar Gabor Juhos Committed by John W. Linville
Browse files

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: default avatarGabor Juhos <juhosg@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 69b307a4

drivers/net/wireless/rt2x00/rt2800.h

+1 −1
Original line number Diff line number Diff line
@@ -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))))

drivers/net/wireless/rt2x00/rt2800lib.c

+2 −2
Original line number Diff line number Diff line
@@ -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.