diff options
| author | Malcolm Priestley | 2013-09-26 19:47:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-09-27 01:40:12 +0200 |
| commit | 9e38a5c1051f4b3593dd2aa6fe74a939569a61fd (patch) | |
| tree | f11707889cf4b3a48e5c492f0c60a6a2711407d1 /drivers/staging/vt6656/rxtx.h | |
| parent | staging: comedi: pcl726: rename interrupt (async cmd) support functions (diff) | |
| download | kernel-qcow2-linux-9e38a5c1051f4b3593dd2aa6fe74a939569a61fd.tar.gz kernel-qcow2-linux-9e38a5c1051f4b3593dd2aa6fe74a939569a61fd.tar.xz kernel-qcow2-linux-9e38a5c1051f4b3593dd2aa6fe74a939569a61fd.zip | |
staging: vt6656: rxtx.c Create union of struct vnt_rrv_time* stuctures
Attach union vnt_tx_head to structure vnt_tx_buffer replacing pointer
pvRrvTime.
In s_vGenerateTxParameter the relevant struct vnt_rrv_time_*
structure is attached to the vnt_tx_head.
The NULL check is now pFifoHead.
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.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h index 137e62d47472..78b7b749ef96 100644 --- a/drivers/staging/vt6656/rxtx.h +++ b/drivers/staging/vt6656/rxtx.h @@ -180,6 +180,12 @@ union vnt_tx_data_head { struct vnt_cts_fb cts_g_fb; }; +union vnt_tx_head { + struct vnt_rrv_time_rts rts; + struct vnt_rrv_time_cts cts; + struct vnt_rrv_time_ab ab; +}; + struct vnt_tx_fifo_head { u32 adwTxKey[4]; u16 wFIFOCtl; @@ -193,6 +199,7 @@ struct vnt_tx_buffer { u8 byPKTNO; u16 wTxByteCount; struct vnt_tx_fifo_head fifo_head; + union vnt_tx_head tx_head; } __packed; struct vnt_beacon_buffer { |