diff options
| author | Lorenzo Bianconi <lorenzo.bianconi@redhat.com> | 2018-10-29 22:16:50 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2018-11-30 12:21:43 +0100 |
| commit | 016ebffba18f6f792ad346c5b62941970f0e5b45 (patch) | |
| tree | 07bea24b6e83eba66aa1b848d3175d822d90f960 | |
| parent | 40b63348030a080e6438d19d354b8e29165fa67a (diff) | |
| download | lwn-016ebffba18f6f792ad346c5b62941970f0e5b45.tar.gz lwn-016ebffba18f6f792ad346c5b62941970f0e5b45.zip | |
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: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c index c338ac0433ad..94a4b58fddc1 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c @@ -166,11 +166,7 @@ static void mt76x2u_init_beacon_offsets(struct mt76x02_dev *dev) int mt76x2u_init_hardware(struct mt76x02_dev *dev) { - const struct mt76_wcid_addr addr = { - .macaddr = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, - .ba_mask = 0, - }; - int i, err; + int i, k, err; mt76x2_reset_wlan(dev, true); mt76x2u_power_on(dev); @@ -210,15 +206,14 @@ int mt76x2u_init_hardware(struct mt76x02_dev *dev) return -ETIMEDOUT; /* reset wcid table */ - for (i = 0; i < 254; i++) - mt76_wr_copy(dev, MT_WCID_ADDR(i), &addr, - sizeof(struct mt76_wcid_addr)); + for (i = 0; i < 256; i++) + mt76x02_mac_wcid_setup(dev, i, 0, NULL); /* reset shared key table and pairwise key table */ - for (i = 0; i < 4; i++) - mt76_wr(dev, MT_SKEY_MODE_BASE_0 + 4 * i, 0); - for (i = 0; i < 256; i++) - mt76_wr(dev, MT_WCID_ATTR(i), 1); + for (i = 0; i < 16; i++) { + for (k = 0; k < 4; k++) + mt76x02_mac_shared_key_setup(dev, i, k, NULL); + } mt76_clear(dev, MT_BEACON_TIME_CFG, MT_BEACON_TIME_CFG_TIMER_EN | |