Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-12 22:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: vt6656: vnt_beacon_xmit use extra_tx_headroom.

Browse Source 
Create room for vnt_tx_short_buf_head in sk_buff and vnt_tx_usb_header.

The struct ieee80211_mgmt is not longer in the header and is at
the initial skb->data point.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Link: https://lore.kernel.org/r/5f00d319-9242-65b2-d100-dcfe9b0e32be@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2020-05-16 11:39:34 +01:00 committed by Greg Kroah-Hartman
parent abfd23743d
commit 9deca1e3e2
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/staging/vt6656/rxtx.c
View File

@ -684,8 +684,9 @@ static int vnt_beacon_xmit(struct vnt_private *priv, struct sk_buff *skb)
spin_unlock_irqrestore(&priv->lock, flags);
beacon_buffer = (struct vnt_beacon_buffer *)&context->data[0];
short_head = &beacon_buffer->short_head;
mgmt_hdr = (struct ieee80211_mgmt *)skb->data;
short_head = skb_push(skb, sizeof(*short_head));
count = skb->len;
if (priv->bb_type == BB_TYPE_11A) {
current_rate = RATE_6M;
@ -710,10 +711,6 @@ static int vnt_beacon_xmit(struct vnt_private *priv, struct sk_buff *skb)
vnt_time_stamp_off(priv, current_rate);
}
/* Generate Beacon Header */
mgmt_hdr = &beacon_buffer->mgmt_hdr;
memcpy(mgmt_hdr, skb->data, skb->len);
/* Get Duration */
short_head->duration = mgmt_hdr->duration;
@ -732,15 +729,14 @@ static int vnt_beacon_xmit(struct vnt_private *priv, struct sk_buff *skb)
if (priv->seq_counter > 0x0fff)
priv->seq_counter = 0;
count = sizeof(struct vnt_tx_short_buf_head) + skb->len;
beacon_buffer->tx_byte_count = cpu_to_le16(count);
beacon_buffer->pkt_no = context->pkt_no;
beacon_buffer->type = 0x01;
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;
context->type = CONTEXT_BEACON_PACKET;
context->tx_buffer = &context->data;
context->buf_len = count + 4; /* USB header */
context->tx_buffer = beacon_buffer;
context->buf_len = skb->len;
spin_lock_irqsave(&priv->lock, flags);

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

@ -180,11 +180,8 @@ struct vnt_tx_short_buf_head {
} __packed;
struct vnt_beacon_buffer {
u8 type;
u8 pkt_no;
__le16 tx_byte_count;
struct vnt_tx_usb_header usb;
struct vnt_tx_short_buf_head short_head;
struct ieee80211_mgmt mgmt_hdr;
} __packed;
int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb);