staging: vt6656: Move tx_key inside vnt_fill_txkey.

tx_key can be got directly from info.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Link: https://lore.kernel.org/r/1b964a6c-5cf7-e675-cf53-3a632acc0be9@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index b9164142e2b55e7bf1cd9910baeb541c57af1ee1..a0672ca511389f39d8c97357bf71d86b42d2d209 100644 (file)
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -382,12 +382,11 @@ static void vnt_generate_tx_parameter(struct vnt_usb_send_context *tx_context,
        vnt_rxtx_ab(tx_context, &tx_buffer->tx_head);
 }
 
-static void vnt_fill_txkey(struct vnt_tx_buffer *tx_buffer,
-                          struct ieee80211_key_conf *tx_key,
-                          struct sk_buff *skb)
+static void vnt_fill_txkey(struct vnt_tx_buffer *tx_buffer, struct sk_buff *skb)
 {
        struct vnt_tx_fifo_head *fifo = &tx_buffer->fifo_head;
        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+       struct ieee80211_key_conf *tx_key = info->control.hw_key;
        struct vnt_mic_hdr *mic_hdr;
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
        u64 pn64;
@@ -629,7 +628,7 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
        if (info->control.hw_key) {
                tx_key = info->control.hw_key;
                if (tx_key->keylen > 0)
-                       vnt_fill_txkey(tx_buffer, tx_key, skb);
+                       vnt_fill_txkey(tx_buffer, skb);
        }
 
        priv->seq_counter = (le16_to_cpu(hdr->seq_ctrl) &