OSDN Git Service

staging: wfx: do not try to save call to hif_set_pm()
authorJérôme Pouiller <jerome.pouiller@silabs.com>
Tue, 17 Dec 2019 16:15:16 +0000 (16:15 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Dec 2019 14:56:17 +0000 (15:56 +0100)
Current code try to not exchange data with device if it is not
necessary. However, it seems that the additional code does not provide
any gain. So, we prefer to keep a simpler code.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20191217161318.31402-36-Jerome.Pouiller@silabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wfx/sta.c

index c57135f..dcb4693 100644 (file)
@@ -371,14 +371,11 @@ int wfx_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
        struct wfx_dev *wdev = hw->priv;
        struct wfx_vif *wvif = (struct wfx_vif *) vif->drv_priv;
        int ret = 0;
-       /* To prevent re-applying PM request OID again and again*/
-       u16 old_uapsd_flags, new_uapsd_flags;
        struct hif_req_edca_queue_params *edca;
 
        mutex_lock(&wdev->conf_mutex);
 
        if (queue < hw->queues) {
-               old_uapsd_flags = *((u16 *) &wvif->uapsd_info);
                edca = &wvif->edca.params[queue];
 
                wvif->edca.uapsd_enable[queue] = params->uapsd;
@@ -395,10 +392,8 @@ int wfx_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
 
                if (wvif->vif->type == NL80211_IFTYPE_STATION) {
                        ret = wfx_set_uapsd_param(wvif, &wvif->edca);
-                       new_uapsd_flags = *((u16 *) &wvif->uapsd_info);
                        if (!ret && wvif->setbssparams_done &&
-                           wvif->state == WFX_STATE_STA &&
-                           old_uapsd_flags != new_uapsd_flags)
+                           wvif->state == WFX_STATE_STA)
                                ret = wfx_update_pm(wvif);
                }
        } else {