diff options
| author |   Lorenzo Bianconi <lorenzo.bianconi@redhat.com> | 2018-10-28 23:54:36 +0100 |
|---|---|---|
| committer |   Felix Fietkau <nbd@nbd.name> | 2018-11-30 12:21:42 +0100 |
| commit | 48c76588221b49e7d46e6f3c26bce0318fbea97a (patch) | |
| tree | 826ff566981e7d89be5803f2775d9ade80652671 /drivers/net/wireless/mediatek | |
| parent | mt76x0: phy: use mt76_poll_msec in mt76x0_phy_temp_sensor (diff) | |
| download | linux-dev-48c76588221b49e7d46e6f3c26bce0318fbea97a.tar.xz linux-dev-48c76588221b49e7d46e6f3c26bce0318fbea97a.zip | |
mt76x0: init: use mt76x02_mac_shared_key_setup in mt76x0_init_hardware
Use mt76x02_mac_shared_key_setup utility routine for shared key
initialization and remove duplicated code
Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'drivers/net/wireless/mediatek')
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt76x0/init.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/init.c b/drivers/net/wireless/mediatek/mt76/mt76x0/init.c index 64eb6f451541..23ff29990ff7 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x0/init.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/init.c @@ -176,13 +176,6 @@ static int mt76x0_init_wcid_mem(struct mt76x02_dev *dev) return 0; } -static void mt76x0_init_key_mem(struct mt76x02_dev *dev) -{ - u32 vals[4] = {}; - - mt76_wr_copy(dev, MT_SKEY_MODE_BASE_0, vals, ARRAY_SIZE(vals)); -} - static int mt76x0_init_wcid_attr_mem(struct mt76x02_dev *dev) { u32 *vals; @@ -260,7 +253,7 @@ EXPORT_SYMBOL_GPL(mt76x0_mac_stop); int mt76x0_init_hardware(struct mt76x02_dev *dev) { - int ret; + int ret, i, k; if (!mt76x02_wait_for_wpdma(&dev->mt76, 1000)) return -EIO; @@ -289,7 +282,9 @@ int mt76x0_init_hardware(struct mt76x02_dev *dev) if (ret) return ret; - mt76x0_init_key_mem(dev); + for (i = 0; i < 16; i++) + for (k = 0; k < 4; k++) + mt76x02_mac_shared_key_setup(dev, i, k, NULL); ret = mt76x0_init_wcid_attr_mem(dev); if (ret) |