diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2020-05-21 10:49:41 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-22 11:02:28 +0200 |
| commit | 4f1b5df4205b0f42019b635e00cc5eeff99481ce (patch) | |
| tree | 5e8788e2cdba22e6018c3f9605920b1d174f4caa /drivers/staging/vt6656 | |
| parent | f79c9fa340c27a48fefc9f5141fad0277db33eb4 (diff) | |
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>
Diffstat (limited to 'drivers/staging/vt6656')
| -rw-r--r-- | drivers/staging/vt6656/rxtx.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index b9164142e2b5..a0672ca51138 100644 --- 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) & |