Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[deliverable/linux.git] / drivers / staging / vt6656 / rxtx.h

diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h
index 6d6539d29d04ce5240cd467f481a892e39d74092..6db3337f1d1d9697399a4b52431c9511297f17d7 100644 (file)
--- a/drivers/staging/vt6656/rxtx.h
+++ b/drivers/staging/vt6656/rxtx.h
@@ -217,15 +217,15 @@ union vnt_tx_head {
 struct vnt_tx_fifo_head {
        u32 adwTxKey[4];
        u16 wFIFOCtl;
-       u16 wTimeStamp;
+       __le16 time_stamp;
        u16 wFragCtl;
-       u16 wReserved;
+       __le16 current_rate;
 } __packed;
 
 struct vnt_tx_buffer {
        u8 byType;
        u8 byPKTNO;
-       u16 wTxByteCount;
+       __le16 tx_byte_count;
        struct vnt_tx_fifo_head fifo_head;
        union vnt_tx_head tx_head;
 } __packed;
@@ -241,16 +241,14 @@ struct vnt_tx_short_buf_head {
 struct vnt_beacon_buffer {
        u8 byType;
        u8 byPKTNO;
-       u16 wTxByteCount;
+       __le16 tx_byte_count;
        struct vnt_tx_short_buf_head short_head;
        struct ieee80211_hdr hdr;
 } __packed;
 
 void vDMA0_tx_80211(struct vnt_private *, struct sk_buff *skb);
-int nsDMA_tx_packet(struct vnt_private *, u32 uDMAIdx, struct sk_buff *skb);
+int nsDMA_tx_packet(struct vnt_private *, struct sk_buff *skb);
 CMD_STATUS csMgmt_xmit(struct vnt_private *, struct vnt_tx_mgmt *);
 CMD_STATUS csBeacon_xmit(struct vnt_private *, struct vnt_tx_mgmt *);
-int bRelayPacketSend(struct vnt_private *, u8 *pbySkbData, u32 uDataLen,
-       u32 uNodeIndex);
 
 #endif /* __RXTX_H__ */