staging: wfx: drop unused link_id field

It is not used anymore.

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-18-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 a53e6d15031bf4e376b282289b6fc1ce8108dc78..f794212f42e2620db43000a81fc07c9d0c820819 100644 (file)
--- a/drivers/staging/wfx/data_tx.c
+++ b/drivers/staging/wfx/data_tx.c
@@ -424,13 +424,8 @@ static int wfx_tx_inner(struct wfx_vif *wvif, struct ieee80211_sta *sta,
        // 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);
-       tx_priv->link_id = tx_priv->raw_link_id;
        if (ieee80211_has_protected(hdr->frame_control))
                tx_priv->hw_key = hw_key;
-       if (tx_info->flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM)
-               tx_priv->link_id = WFX_LINK_ID_AFTER_DTIM;
-       if (sta && (sta->uapsd_queues & BIT(queue_id)))
-               tx_priv->link_id = WFX_LINK_ID_UAPSD;
 
        // Fill hif_msg
        WARN(skb_headroom(skb) < wmsg_len, "not enough space in skb");

diff --git a/drivers/staging/wfx/data_tx.h b/drivers/staging/wfx/data_tx.h
index c545dd75449b6d6a3265af505a40bd35458de803..b561bbf9f16fee9863ba903ce45490adb37a12b1 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 link_id;
        u8 raw_link_id;
 } __packed;
 

diff --git a/drivers/staging/wfx/queue.h b/drivers/staging/wfx/queue.h
index dd141cb4bf6342b6b2ace4ea1415e3d1114c564c..39c265e4b86ef90aaf44fcce9dc3e41b65c63892 100644 (file)
--- a/drivers/staging/wfx/queue.h
+++ b/drivers/staging/wfx/queue.h
@@ -14,8 +14,6 @@
 
 #define WFX_MAX_STA_IN_AP_MODE    14
 #define WFX_LINK_ID_NO_ASSOC      15
-#define WFX_LINK_ID_AFTER_DTIM    (WFX_LINK_ID_NO_ASSOC + 1)
-#define WFX_LINK_ID_UAPSD         (WFX_LINK_ID_NO_ASSOC + 2)
 
 struct wfx_dev;
 struct wfx_vif;