1 files changed, 8 insertions, 9 deletions

diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c
index b2b0fe1faa96..0f3e4334c8e3 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.c
+++ b/drivers/net/wireless/ath/wil6210/wmi.c
@@ -566,7 +566,6 @@ static void wil_addba_tx_cid(struct wil6210_priv *wil, u8 cid, u16 wsize)
 
 static void wmi_evt_linkup(struct wil6210_priv *wil, int id, void *d, int len)
 {
-        struct net_device *ndev = wil_to_ndev(wil);
         struct wmi_data_port_open_event *evt = d;
         u8 cid = evt->cid;
 
@@ -580,7 +579,6 @@ static void wmi_evt_linkup(struct wil6210_priv *wil, int id, void *d, int len)
         wil->sta[cid].data_port_open = true;
         if (agg_wsize >= 0)
                 wil_addba_tx_cid(wil, cid, agg_wsize);
-        netif_carrier_on(ndev);
 }
 
 static void wmi_evt_linkdown(struct wil6210_priv *wil, int id, void *d, int len)
@@ -1133,12 +1131,13 @@ int wmi_rx_chain_add(struct wil6210_priv *wil, struct vring *vring)
         return rc;
 }
 
-int wmi_get_temperature(struct wil6210_priv *wil, u32 *t_m, u32 *t_r)
+int wmi_get_temperature(struct wil6210_priv *wil, u32 *t_bb, u32 *t_rf)
 {
         int rc;
         struct wmi_temp_sense_cmd cmd = {
-                .measure_marlon_m_en = cpu_to_le32(!!t_m),
-                .measure_marlon_r_en = cpu_to_le32(!!t_r),
+                .measure_baseband_en = cpu_to_le32(!!t_bb),
+                .measure_rf_en = cpu_to_le32(!!t_rf),
+                .measure_mode = cpu_to_le32(TEMPERATURE_MEASURE_NOW),
         };
         struct {
                 struct wil6210_mbox_hdr_wmi wmi;
@@ -1150,10 +1149,10 @@ int wmi_get_temperature(struct wil6210_priv *wil, u32 *t_m, u32 *t_r)
         if (rc)
                 return rc;
 
-        if (t_m)
-                *t_m = le32_to_cpu(reply.evt.marlon_m_t1000);
-        if (t_r)
-                *t_r = le32_to_cpu(reply.evt.marlon_r_t1000);
+        if (t_bb)
+                *t_bb = le32_to_cpu(reply.evt.baseband_t1000);
+        if (t_rf)
+                *t_rf = le32_to_cpu(reply.evt.rf_t1000);
 
         return 0;
 }