1 From a058825fa7b53fab3b003d8928b60e5b686b3421 Mon Sep 17 00:00:00 2001
2 From: Gabor Juhos <juhosg@openwrt.org>
3 Date: Sun, 4 Aug 2013 14:36:11 +0200
4 Subject: [PATCH] rt2x00: rt2800lib: add hw_beacon_count field to struct
7 Some chipsets can handle more than 8 beacons at once.
8 Add a new field to the rt2800_drv_data structure which
9 will hold the number of supported beacons of the given
12 Update the rt2x00_init_registers function to get the
13 beacon count from the new field instead of using a
16 In order to keep the current behaviour, initialize the
17 new field with the actually used value.
19 Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
21 drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 5 ++++-
22 drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 1 +
23 2 files changed, 5 insertions(+), 1 deletion(-)
25 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
26 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
27 @@ -4615,6 +4615,7 @@ EXPORT_SYMBOL_GPL(rt2800_link_tuner);
29 static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
31 + struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
35 @@ -4980,7 +4981,7 @@ static int rt2800_init_registers(struct
39 - for (i = 0; i < 8; i++)
40 + for (i = 0; i < drv_data->hw_beacon_count; i++)
41 rt2800_clear_beacon_register(rt2x00dev, i);
43 if (rt2x00_is_usb(rt2x00dev)) {
44 @@ -7831,6 +7832,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
45 if (rt2x00_rt(rt2x00dev, RT3593))
46 __set_bit(RT2800_HAS_HIGH_SHARED_MEM, &drv_data->rt2800_flags);
48 + drv_data->hw_beacon_count = 8;
51 * Allocate eeprom data.
53 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
54 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
55 @@ -35,6 +35,7 @@ struct rt2800_drv_data {
58 unsigned int tbtt_tick;
59 + unsigned int hw_beacon_count;
60 DECLARE_BITMAP(sta_ids, STA_IDS_SIZE);
62 unsigned long rt2800_flags;