diff options
| author | Lorenzo Bianconi <lorenzo@kernel.org> | 2019-06-08 17:44:36 +0300 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2019-06-27 13:58:13 +0300 |
| commit | 760556042acdd4f0c964fd6403f828b33fce3822 (patch) | |
| tree | 308cba3a7a6054bffb63bea82a63324c159b1d7f /drivers/net/wireless/mediatek | |
| parent | ac7ff57127cc5aec434b2220f6e80ab319646984 (diff) | |
| download | linux-760556042acdd4f0c964fd6403f828b33fce3822.tar.xz | |
mt76: mt7615: simplify mt7615_mcu_set_sta_rec routine
Move conn_type configuration directly in mt7615_mcu_set_sta_rec and
remove sta_rec_convert_vif_type since it is actually used just in
mt7615_mcu_set_sta_rec
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'drivers/net/wireless/mediatek')
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c index 76431d00a8ac..79baa455034c 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c @@ -1040,30 +1040,11 @@ int mt7615_mcu_set_sta_rec_bmc(struct mt7615_dev *dev, &req, sizeof(req), true); } -static void sta_rec_convert_vif_type(enum nl80211_iftype type, u32 *conn_type) -{ - switch (type) { - case NL80211_IFTYPE_AP: - case NL80211_IFTYPE_MESH_POINT: - if (conn_type) - *conn_type = CONNECTION_INFRA_STA; - break; - case NL80211_IFTYPE_STATION: - if (conn_type) - *conn_type = CONNECTION_INFRA_AP; - break; - default: - WARN_ON(1); - break; - }; -} - int mt7615_mcu_set_sta_rec(struct mt7615_dev *dev, struct ieee80211_vif *vif, struct ieee80211_sta *sta, bool en) { struct mt7615_vif *mvif = (struct mt7615_vif *)vif->drv_priv; struct mt7615_sta *msta = (struct mt7615_sta *)sta->drv_priv; - u32 conn_type = 0; struct { struct sta_req_hdr hdr; @@ -1085,8 +1066,18 @@ int mt7615_mcu_set_sta_rec(struct mt7615_dev *dev, struct ieee80211_vif *vif, }; memcpy(req.basic.peer_addr, sta->addr, ETH_ALEN); - sta_rec_convert_vif_type(vif->type, &conn_type); - req.basic.conn_type = cpu_to_le32(conn_type); + switch (vif->type) { + case NL80211_IFTYPE_AP: + case NL80211_IFTYPE_MESH_POINT: + req.basic.conn_type = cpu_to_le32(CONNECTION_INFRA_STA); + break; + case NL80211_IFTYPE_STATION: + req.basic.conn_type = cpu_to_le32(CONNECTION_INFRA_AP); + break; + default: + WARN_ON(1); + break; + }; if (en) { req.basic.conn_state = CONN_STATE_PORT_SECURE; |