From b44472e9982263dead4e082f9edef531b4969e41 Mon Sep 17 00:00:00 2001 From: Shayne Chen Date: Fri, 4 Dec 2020 17:36:57 +0800 Subject: [PATCH] mt76: testmode: move mtd part to mt76_dev Move testmode mtd variables to mt76_dev, since they are the same on each phy. Signed-off-by: Shayne Chen Acked-by: Ryder Lee Signed-off-by: Felix Fietkau --- eeprom.c | 4 ++-- mt76.h | 7 ++++--- testmode.c | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/eeprom.c b/eeprom.c index 5726d16f..65813f19 100644 --- a/eeprom.c +++ b/eeprom.c @@ -75,8 +75,8 @@ mt76_get_of_eeprom(struct mt76_dev *dev, int len) } #ifdef CONFIG_NL80211_TESTMODE - dev->phy.test.mtd_name = devm_kstrdup(dev->dev, part, GFP_KERNEL); - dev->phy.test.mtd_offset = offset; + dev->test_mtd.name = devm_kstrdup(dev->dev, part, GFP_KERNEL); + dev->test_mtd.offset = offset; #endif out_put_node: diff --git a/mt76.h b/mt76.h index 5f3dc2c0..5ff1bced 100644 --- a/mt76.h +++ b/mt76.h @@ -546,9 +546,6 @@ struct mt76_testmode_data { u8 tx_power[4]; u8 tx_power_control; - const char *mtd_name; - u32 mtd_offset; - u32 tx_pending; u32 tx_queued; u32 tx_done; @@ -667,6 +664,10 @@ struct mt76_dev { #ifdef CONFIG_NL80211_TESTMODE const struct mt76_testmode_ops *test_ops; + struct { + const char *name; + u32 offset; + } test_mtd; #endif struct workqueue_struct *wq; diff --git a/testmode.c b/testmode.c index 184964b9..8b14620e 100644 --- a/testmode.c +++ b/testmode.c @@ -482,9 +482,9 @@ int mt76_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *msg, if (nla_put_u32(msg, MT76_TM_ATTR_STATE, td->state)) goto out; - if (td->mtd_name && - (nla_put_string(msg, MT76_TM_ATTR_MTD_PART, td->mtd_name) || - nla_put_u32(msg, MT76_TM_ATTR_MTD_OFFSET, td->mtd_offset))) + if (dev->test_mtd.name && + (nla_put_string(msg, MT76_TM_ATTR_MTD_PART, dev->test_mtd.name) || + nla_put_u32(msg, MT76_TM_ATTR_MTD_OFFSET, dev->test_mtd.offset))) goto out; if (nla_put_u32(msg, MT76_TM_ATTR_TX_COUNT, td->tx_count) ||