summaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6656/rxtx.h
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2013-11-24 13:25:25 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-11-25 12:41:43 -0800
commitc7c57b24a5411c5314686a7916971e57adeded7d (patch)
tree87acfc2bde6f691742553b5b632c9f2e7e803395 /drivers/staging/vt6656/rxtx.h
parentc47b0a34538dcbabb8aface7b4397148e6e24f17 (diff)
downloadlinux-c7c57b24a5411c5314686a7916971e57adeded7d.tar.bz2
staging: vt6656: csBeacon_xmit merge structures.
Merge structures typedef struct tagSTxShortBufHead and the members of struct vnt_tx_datahead_ab to form single structure vnt_tx_short_buf_head. Remove the duplicate members in struct vnt_beacon_buffer already in typedef struct tagSTxShortBufHead. This removes the need for any pointer arithmetic. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656/rxtx.h')
-rw-r--r--drivers/staging/vt6656/rxtx.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h
index eecbe890027e..bb21ad6ae226 100644
--- a/drivers/staging/vt6656/rxtx.h
+++ b/drivers/staging/vt6656/rxtx.h
@@ -230,12 +230,19 @@ struct vnt_tx_buffer {
union vnt_tx_head tx_head;
} __packed;
+struct vnt_tx_short_buf_head {
+ u16 fifo_ctl;
+ u16 time_stamp;
+ struct vnt_phy_field ab;
+ u16 duration;
+ u16 time_stamp_off;
+} __packed;
+
struct vnt_beacon_buffer {
u8 byType;
u8 byPKTNO;
u16 wTxByteCount;
- u16 wFIFOCtl;
- u16 wTimeStamp;
+ struct vnt_tx_short_buf_head short_head;
} __packed;
void vDMA0_tx_80211(struct vnt_private *, struct sk_buff *skb);