staging: wfx: drop unused raw_link_id field

raw_link_id can be retrieved by wfx_tx_get_raw_link_id(). So, it is not
necessary to keep it in struct wfx_tx_priv.

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-19-Jerome.Pouiller@silabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wfx/data_tx.c b/drivers/staging/wfx/data_tx.c
index f794212f42e2620db43000a81fc07c9d0c820819..57afabc102a74e49d4b0e8a0123016b46ef0c0a6 100644 (file)
--- a/drivers/staging/wfx/data_tx.c
+++ b/drivers/staging/wfx/data_tx.c
@@ -423,7 +423,6 @@ static int wfx_tx_inner(struct wfx_vif *wvif, struct ieee80211_sta *sta,
        memset(tx_info->rate_driver_data, 0, sizeof(struct wfx_tx_priv));
        // Fill tx_priv
        tx_priv = (struct wfx_tx_priv *)tx_info->rate_driver_data;
-       tx_priv->raw_link_id = wfx_tx_get_raw_link_id(wvif, sta, hdr);
        if (ieee80211_has_protected(hdr->frame_control))
                tx_priv->hw_key = hw_key;
 
@@ -455,7 +454,7 @@ static int wfx_tx_inner(struct wfx_vif *wvif, struct ieee80211_sta *sta,
        req->data_flags.fc_offset = offset;
        if (tx_info->flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM)
                req->data_flags.after_dtim = 1;
-       req->queue_id.peer_sta_id = tx_priv->raw_link_id;
+       req->queue_id.peer_sta_id = wfx_tx_get_raw_link_id(wvif, sta, hdr);
        // Queue index are inverted between firmware and Linux
        req->queue_id.queue_id = 3 - queue_id;
        req->ht_tx_parameters = wfx_tx_get_tx_parms(wvif->wdev, tx_info);

diff --git a/drivers/staging/wfx/data_tx.h b/drivers/staging/wfx/data_tx.h
index b561bbf9f16fee9863ba903ce45490adb37a12b1..03fe3e319ba1a95a44064fc2f3108b54084bb7c5 100644 (file)
--- a/drivers/staging/wfx/data_tx.h
+++ b/drivers/staging/wfx/data_tx.h
@@ -36,7 +36,6 @@ struct tx_policy_cache {
 struct wfx_tx_priv {
        ktime_t xmit_timestamp;
        struct ieee80211_key_conf *hw_key;
-       u8 raw_link_id;
 } __packed;
 
 void wfx_tx_policy_init(struct wfx_vif *wvif);