Commit 016ebffb authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau

mt76x2u: init: use common routines for wcid/key initialization

Use mt76x02_mac_wcid_setup and mt76x02_mac_shared_key_setup for
shared keys and wcid table initialization and remove duplicated
code
Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 40b63348
...@@ -166,11 +166,7 @@ static void mt76x2u_init_beacon_offsets(struct mt76x02_dev *dev) ...@@ -166,11 +166,7 @@ static void mt76x2u_init_beacon_offsets(struct mt76x02_dev *dev)
int mt76x2u_init_hardware(struct mt76x02_dev *dev) int mt76x2u_init_hardware(struct mt76x02_dev *dev)
{ {
const struct mt76_wcid_addr addr = { int i, k, err;
.macaddr = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
.ba_mask = 0,
};
int i, err;
mt76x2_reset_wlan(dev, true); mt76x2_reset_wlan(dev, true);
mt76x2u_power_on(dev); mt76x2u_power_on(dev);
...@@ -210,15 +206,14 @@ int mt76x2u_init_hardware(struct mt76x02_dev *dev) ...@@ -210,15 +206,14 @@ int mt76x2u_init_hardware(struct mt76x02_dev *dev)
return -ETIMEDOUT; return -ETIMEDOUT;
/* reset wcid table */ /* reset wcid table */
for (i = 0; i < 254; i++) for (i = 0; i < 256; i++)
mt76_wr_copy(dev, MT_WCID_ADDR(i), &addr, mt76x02_mac_wcid_setup(dev, i, 0, NULL);
sizeof(struct mt76_wcid_addr));
/* reset shared key table and pairwise key table */ /* reset shared key table and pairwise key table */
for (i = 0; i < 4; i++) for (i = 0; i < 16; i++) {
mt76_wr(dev, MT_SKEY_MODE_BASE_0 + 4 * i, 0); for (k = 0; k < 4; k++)
for (i = 0; i < 256; i++) mt76x02_mac_shared_key_setup(dev, i, k, NULL);
mt76_wr(dev, MT_WCID_ATTR(i), 1); }
mt76_clear(dev, MT_BEACON_TIME_CFG, mt76_clear(dev, MT_BEACON_TIME_CFG,
MT_BEACON_TIME_CFG_TIMER_EN | MT_BEACON_TIME_CFG_TIMER_EN |
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment