redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: vt6656: Fix vnt_tx_usb_header static checker warning

Browse source 
drivers/staging/vt6656/rxtx.c:729 vnt_beacon_xmit()
warn: struct type mismatch 'vnt_beacon_buffer vs vnt_tx_usb_header'

Since the only part of vnt_beacon_buffer is used remove and
replace it with vnt_tx_usb_header.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/9818e564-81f6-a683-caa0-69423fded401@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2020-05-24 00:12:41 +01:00 committed by Greg Kroah-Hartman
parent 15ea976a1f
commit a069cd178f
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/staging/vt6656/rxtx.c
View file

@ -634,7 +634,7 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
static int vnt_beacon_xmit(struct vnt_private *priv, struct sk_buff *skb)
{
struct vnt_beacon_buffer *beacon_buffer;
struct vnt_tx_usb_header *usb;
struct vnt_tx_short_buf_head *short_head;
struct ieee80211_tx_info *info;
struct vnt_usb_send_context *context;
@ -701,13 +701,13 @@ static int vnt_beacon_xmit(struct vnt_private *priv, struct sk_buff *skb)
if (priv->seq_counter > 0x0fff)
priv->seq_counter = 0;
beacon_buffer = skb_push(skb, sizeof(struct vnt_tx_usb_header));
beacon_buffer->usb.tx_byte_count = cpu_to_le16(count);
beacon_buffer->usb.pkt_no = context->pkt_no;
beacon_buffer->usb.type = 0x01;
usb = skb_push(skb, sizeof(*usb));
usb->tx_byte_count = cpu_to_le16(count);
usb->pkt_no = context->pkt_no;
usb->type = 0x01;
context->type = CONTEXT_BEACON_PACKET;
context->tx_buffer = beacon_buffer;
context->tx_buffer = usb;
context->buf_len = skb->len;
spin_lock_irqsave(&priv->lock, flags);

5
drivers/staging/vt6656/rxtx.h
View file

@ -179,11 +179,6 @@ struct vnt_tx_short_buf_head {
__le16 time_stamp_off;
} __packed;
struct vnt_beacon_buffer {
struct vnt_tx_usb_header usb;
struct vnt_tx_short_buf_head short_head;
} __packed;
int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb);
int vnt_beacon_make(struct vnt_private *priv, struct ieee80211_vif *vif);
int vnt_beacon_enable(struct vnt_private *priv, struct ieee80211_vif *vif,