staging: wfx: simplify hif_handle_tx_data()

The last argument of hif_handle_tx_data() was now unused. In add,
hif_handle_tx_data() has nothing to do with HIF layer and should be
renamed. Finally, it not convenient to pass a wfx_vif as parameter. It
is easier to let hif_handle_tx_data() find the interface itself.

Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200401110405.80282-9-Jerome.Pouiller@silabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wfx/queue.c b/drivers/staging/wfx/queue.c
index 2553f77522d9de8be8e8d92f1520e189a868bc5b..8647731e02c09e942ef3c199e8f348c9ced5db13 100644 (file)
--- a/drivers/staging/wfx/queue.c
+++ b/drivers/staging/wfx/queue.c
@@ -319,13 +319,17 @@ bool wfx_tx_queues_is_empty(struct wfx_dev *wdev)
        return ret;
 }
 
-static bool hif_handle_tx_data(struct wfx_vif *wvif, struct sk_buff *skb,
-                              struct wfx_queue *queue)
+static bool wfx_handle_tx_data(struct wfx_dev *wdev, struct sk_buff *skb)
 {
        struct hif_req_tx *req = wfx_skb_txreq(skb);
        struct ieee80211_key_conf *hw_key = wfx_skb_tx_priv(skb)->hw_key;
        struct ieee80211_hdr *frame =
                (struct ieee80211_hdr *)(req->frame + req->data_flags.fc_offset);
+       struct wfx_vif *wvif =
+               wdev_to_wvif(wdev, ((struct hif_msg *)skb->data)->interface);
+
+       if (!wvif)
+               return false;
 
        // FIXME: mac80211 is smart enough to handle BSS loss. Driver should not
        // try to do anything about that.
@@ -344,12 +348,12 @@ static bool hif_handle_tx_data(struct wfx_vif *wvif, struct sk_buff *skb,
            hw_key && hw_key->keyidx != wvif->wep_default_key_id &&
            (hw_key->cipher == WLAN_CIPHER_SUITE_WEP40 ||
             hw_key->cipher == WLAN_CIPHER_SUITE_WEP104)) {
-               wfx_tx_lock(wvif->wdev);
+               wfx_tx_lock(wdev);
                WARN_ON(wvif->wep_pending_skb);
                wvif->wep_default_key_id = hw_key->keyidx;
                wvif->wep_pending_skb = skb;
                if (!schedule_work(&wvif->wep_key_work))
-                       wfx_tx_unlock(wvif->wdev);
+                       wfx_tx_unlock(wdev);
                return true;
        } else {
                return false;
@@ -496,13 +500,10 @@ struct hif_msg *wfx_tx_queues_get(struct wfx_dev *wdev)
                skb = wfx_tx_queue_get(wdev, queue, tx_allowed_mask);
                if (!skb)
                        continue;
-               hif = (struct hif_msg *)skb->data;
-               wvif = wdev_to_wvif(wdev, hif->interface);
-               WARN_ON(!wvif);
 
-               if (hif_handle_tx_data(wvif, skb, queue))
+               if (wfx_handle_tx_data(wdev, skb))
                        continue;  /* Handled by WSM */
 
-               return hif;
+               return (struct hif_msg *)skb->data;
        }
 }