rtw89: rename vif_maintain to role_maintain

The H2C_FUNC_MAC_FWROLE_MAINTAIN also maintains the roles of all connected
stations; not just the role of VIF. So, I correct the name, but don't
change the logic at all.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220107034239.22002-9-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index e9a9fd5d1ec7be554aff4fcafb0d11e4c5b0f17a..202c78a74ade15a03bc4a29449daaea4c6ef07fd 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -138,11 +138,11 @@ enum rtw89_wifi_role {
 };
 
 enum rtw89_upd_mode {
-       RTW89_VIF_CREATE,
-       RTW89_VIF_REMOVE,
-       RTW89_VIF_TYPE_CHANGE,
-       RTW89_VIF_INFO_CHANGE,
-       RTW89_VIF_CON_DISCONN
+       RTW89_ROLE_CREATE,
+       RTW89_ROLE_REMOVE,
+       RTW89_ROLE_TYPE_CHANGE,
+       RTW89_ROLE_INFO_CHANGE,
+       RTW89_ROLE_CON_DISCONN
 };
 
 enum rtw89_self_role {

diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c
index 0235b7f2e4255f0d1f03109a99db9a64026037f7..2d5b6323b607d52d78c6809699a547799cab3ede 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/fw.c
+++ b/drivers/net/wireless/realtek/rtw89/fw.c
@@ -990,19 +990,19 @@ int rtw89_fw_h2c_update_beacon(struct rtw89_dev *rtwdev,
        return 0;
 }
 
-#define H2C_VIF_MAINTAIN_LEN 4
-int rtw89_fw_h2c_vif_maintain(struct rtw89_dev *rtwdev,
-                             struct rtw89_vif *rtwvif,
-                             enum rtw89_upd_mode upd_mode)
+#define H2C_ROLE_MAINTAIN_LEN 4
+int rtw89_fw_h2c_role_maintain(struct rtw89_dev *rtwdev,
+                              struct rtw89_vif *rtwvif,
+                              enum rtw89_upd_mode upd_mode)
 {
        struct sk_buff *skb;
 
-       skb = rtw89_fw_h2c_alloc_skb_with_hdr(H2C_VIF_MAINTAIN_LEN);
+       skb = rtw89_fw_h2c_alloc_skb_with_hdr(H2C_ROLE_MAINTAIN_LEN);
        if (!skb) {
                rtw89_err(rtwdev, "failed to alloc skb for h2c join\n");
                return -ENOMEM;
        }
-       skb_put(skb, H2C_VIF_MAINTAIN_LEN);
+       skb_put(skb, H2C_ROLE_MAINTAIN_LEN);
        SET_FWROLE_MAINTAIN_MACID(skb->data, rtwvif->mac_id);
        SET_FWROLE_MAINTAIN_SELF_ROLE(skb->data, rtwvif->self_role);
        SET_FWROLE_MAINTAIN_UPD_MODE(skb->data, upd_mode);
@@ -1011,7 +1011,7 @@ int rtw89_fw_h2c_vif_maintain(struct rtw89_dev *rtwdev,
        rtw89_h2c_pkt_set_hdr(rtwdev, skb, FWCMD_TYPE_H2C,
                              H2C_CAT_MAC, H2C_CL_MAC_MEDIA_RPT,
                              H2C_FUNC_MAC_FWROLE_MAINTAIN, 0, 1,
-                             H2C_VIF_MAINTAIN_LEN);
+                             H2C_ROLE_MAINTAIN_LEN);
 
        if (rtw89_h2c_tx(rtwdev, skb, false)) {
                rtw89_err(rtwdev, "failed to send h2c\n");

diff --git a/drivers/net/wireless/realtek/rtw89/fw.h b/drivers/net/wireless/realtek/rtw89/fw.h
index 55f11e7886d52de8ea795bf71b6994ab04ff1316..b30cf0a2cc1e04fc00ac95fe04b6d216fe78eafd 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/fw.h
+++ b/drivers/net/wireless/realtek/rtw89/fw.h
@@ -1884,9 +1884,9 @@ int rtw89_fw_h2c_cam(struct rtw89_dev *rtwdev, struct rtw89_vif *vif,
                     struct rtw89_sta *rtwsta, const u8 *scan_mac_addr);
 void rtw89_fw_c2h_irqsafe(struct rtw89_dev *rtwdev, struct sk_buff *c2h);
 void rtw89_fw_c2h_work(struct work_struct *work);
-int rtw89_fw_h2c_vif_maintain(struct rtw89_dev *rtwdev,
-                             struct rtw89_vif *rtwvif,
-                             enum rtw89_upd_mode upd_mode);
+int rtw89_fw_h2c_role_maintain(struct rtw89_dev *rtwdev,
+                              struct rtw89_vif *rtwvif,
+                              enum rtw89_upd_mode upd_mode);
 int rtw89_fw_h2c_join_info(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif,
                           struct rtw89_sta *rtwsta, bool dis_conn);
 int rtw89_fw_h2c_macid_pause(struct rtw89_dev *rtwdev, u8 sh, u8 grp,

diff --git a/drivers/net/wireless/realtek/rtw89/mac.c b/drivers/net/wireless/realtek/rtw89/mac.c
index 104219107ce866627290e5f1873f697d2fa6883e..a7f5fba25511f298e28450d181016ebddf006896 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/mac.c
+++ b/drivers/net/wireless/realtek/rtw89/mac.c
@@ -2994,7 +2994,7 @@ int rtw89_mac_vif_init(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)
        if (ret)
                return ret;
 
-       ret = rtw89_fw_h2c_vif_maintain(rtwdev, rtwvif, RTW89_VIF_CREATE);
+       ret = rtw89_fw_h2c_role_maintain(rtwdev, rtwvif, RTW89_ROLE_CREATE);
        if (ret)
                return ret;
 
@@ -3017,7 +3017,7 @@ int rtw89_mac_vif_deinit(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)
 {
        int ret;
 
-       ret = rtw89_fw_h2c_vif_maintain(rtwdev, rtwvif, RTW89_VIF_REMOVE);
+       ret = rtw89_fw_h2c_role_maintain(rtwdev, rtwvif, RTW89_ROLE_REMOVE);
        if (ret)
                return ret;