diff options
Diffstat (limited to 'drivers/staging/vt6656/rxtx.h')
| -rw-r--r-- | drivers/staging/vt6656/rxtx.h | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h index 6db3337f1d1d..90b34ab2f6ce 100644 --- a/drivers/staging/vt6656/rxtx.h +++ b/drivers/staging/vt6656/rxtx.h @@ -33,13 +33,15 @@ #include "wcmd.h" #include "baseband.h" +#define DEFAULT_MGN_LIFETIME_RES_64us 125 /* 64us */ +#define DEFAULT_MSDU_LIFETIME_RES_64us 8000 + /* MIC HDR data header */ struct vnt_mic_hdr { u8 id; u8 tx_priority; u8 mic_addr2[6]; - __be32 tsc_47_16; - __be16 tsc_15_0; + u8 ccmp_pn[IEEE80211_CCMP_PN_LEN]; __be16 payload_len; __be16 hlen; __le16 frame_control; @@ -81,6 +83,7 @@ struct vnt_tx_datahead_g { __le16 duration_a; __le16 time_stamp_off_b; __le16 time_stamp_off_a; + struct ieee80211_hdr hdr; } __packed; struct vnt_tx_datahead_g_fb { @@ -92,12 +95,14 @@ struct vnt_tx_datahead_g_fb { __le16 duration_a_f1; __le16 time_stamp_off_b; __le16 time_stamp_off_a; + struct ieee80211_hdr hdr; } __packed; struct vnt_tx_datahead_ab { struct vnt_phy_field ab; __le16 duration; __le16 time_stamp_off; + struct ieee80211_hdr hdr; } __packed; struct vnt_tx_datahead_a_fb { @@ -106,6 +111,7 @@ struct vnt_tx_datahead_a_fb { __le16 time_stamp_off; __le16 duration_f0; __le16 duration_f1; + struct ieee80211_hdr hdr; } __packed; /* RTS buffer header */ @@ -215,23 +221,23 @@ union vnt_tx_head { }; struct vnt_tx_fifo_head { - u32 adwTxKey[4]; - u16 wFIFOCtl; + u8 tx_key[WLAN_KEY_LEN_CCMP]; + __le16 fifo_ctl; __le16 time_stamp; - u16 wFragCtl; + __le16 frag_ctl; __le16 current_rate; } __packed; struct vnt_tx_buffer { - u8 byType; - u8 byPKTNO; + u8 type; + u8 pkt_no; __le16 tx_byte_count; struct vnt_tx_fifo_head fifo_head; union vnt_tx_head tx_head; } __packed; struct vnt_tx_short_buf_head { - u16 fifo_ctl; + __le16 fifo_ctl; u16 time_stamp; struct vnt_phy_field ab; __le16 duration; @@ -239,16 +245,16 @@ struct vnt_tx_short_buf_head { } __packed; struct vnt_beacon_buffer { - u8 byType; - u8 byPKTNO; + u8 type; + u8 pkt_no; __le16 tx_byte_count; struct vnt_tx_short_buf_head short_head; - struct ieee80211_hdr hdr; + struct ieee80211_mgmt mgmt_hdr; } __packed; -void vDMA0_tx_80211(struct vnt_private *, 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 vnt_tx_packet(struct vnt_private *, struct sk_buff *); +int vnt_beacon_make(struct vnt_private *, struct ieee80211_vif *); +int vnt_beacon_enable(struct vnt_private *, struct ieee80211_vif *, + struct ieee80211_bss_conf *); #endif /* __RXTX_H__ */ |