diff options
| author |   Malcolm Priestley <tvboxspy@gmail.com> | 2020-05-21 10:31:36 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-22 11:02:26 +0200 |
| commit | 461aac1cbc8217bfc319c839798e7f18eba447c0 (patch) | |
| tree | 795df96916bcfbe18dcabe41b4f29ec5789e9eb2 /drivers/staging/vt6656 | |
| parent | staging: fbtft: fb_st7789v: make HSD20_IPS numeric and not a string (diff) | |
| download | linux-dev-461aac1cbc8217bfc319c839798e7f18eba447c0.tar.xz linux-dev-461aac1cbc8217bfc319c839798e7f18eba447c0.zip | |
staging: vt6656: remove ieee80211_hdr from vnt_usb_send_context.
It is only used in one place were it can be pointed to at skb->data.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Link: https://lore.kernel.org/r/556fab01-aa1e-154e-149e-c04feeb76efa@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656')
| -rw-r--r-- | drivers/staging/vt6656/device.h | 1 | ||||
| -rw-r--r-- | drivers/staging/vt6656/rxtx.c | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index d1b19dcaf991..0486aabba061 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -238,7 +238,6 @@ struct vnt_rcb { struct vnt_usb_send_context { void *priv; struct sk_buff *skb; - struct ieee80211_hdr *hdr; void *tx_buffer; unsigned int buf_len; u32 frame_len; diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 8f9904c8045c..a47f42bedfa9 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -73,8 +73,6 @@ static struct vnt_usb_send_context context = priv->tx_context[ii]; if (!context->in_use) { context->in_use = true; - context->hdr = NULL; - return context; } } @@ -392,7 +390,7 @@ static void vnt_fill_txkey(struct vnt_usb_send_context *tx_context, struct sk_buff *skb, u16 payload_len, struct vnt_mic_hdr *mic_hdr) { - struct ieee80211_hdr *hdr = tx_context->hdr; + struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; u64 pn64; u8 *iv = ((u8 *)hdr + ieee80211_get_hdrlen_from_skb(skb)); @@ -544,7 +542,6 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb) tx_context->need_ack = false; tx_context->frame_len = skb->len + 4; tx_context->tx_rate = rate->hw_value; - tx_context->hdr = hdr; spin_unlock_irqrestore(&priv->lock, flags); |