diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-03-06 22:44:21 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-08 22:31:31 -0800 |
| commit | 829127b4380b232197ccfab33c3ce09ed1b5fc3f (patch) | |
| tree | 0c37ea5983562fddba69b0f47b5b0a50fbd15ee5 /drivers/staging/vt6655 | |
| parent | 3cf477b56c989c3ea76c2350b3e6969861d6e0c6 (diff) | |
staging: vt6655: 64 bit Correct alignment of tx/rx structures.
Aligment of pointers on 64 bit is incorrect.
Align to 64 bit using aligned 8 bytes and remove structure packing.
This allows the device to run on both 32 and 64 bit
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6655')
| -rw-r--r-- | drivers/staging/vt6655/desc.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/staging/vt6655/desc.h b/drivers/staging/vt6655/desc.h index 32d808ec502a..f8e41487f856 100644 --- a/drivers/staging/vt6655/desc.h +++ b/drivers/staging/vt6655/desc.h @@ -276,9 +276,8 @@ typedef struct tagSRxDesc { volatile SRDES1 m_rd1RD1; volatile u32 buff_addr; volatile u32 next_desc; - struct tagSRxDesc *next;//4 bytes - volatile PDEVICE_RD_INFO pRDInfo;//4 bytes - volatile u32 Reserved[2];//8 bytes + struct tagSRxDesc *next __aligned(8); + volatile PDEVICE_RD_INFO pRDInfo __aligned(8); } __attribute__ ((__packed__)) SRxDesc, *PSRxDesc; typedef const SRxDesc *PCSRxDesc; @@ -361,9 +360,8 @@ typedef struct tagSTxDesc { volatile STDES1 m_td1TD1; volatile u32 buff_addr; volatile u32 next_desc; - struct tagSTxDesc *next; //4 bytes - volatile PDEVICE_TD_INFO pTDInfo;//4 bytes - volatile u32 Reserved[2];//8 bytes + struct tagSTxDesc *next __aligned(8); + volatile PDEVICE_TD_INFO pTDInfo __aligned(8); } __attribute__ ((__packed__)) STxDesc, *PSTxDesc; typedef const STxDesc *PCSTxDesc; @@ -375,9 +373,8 @@ typedef struct tagSTxSyncDesc { volatile u32 next_desc; // pointer to next logical descriptor volatile unsigned short m_wFIFOCtl; volatile unsigned short m_wTimeStamp; - struct tagSTxSyncDesc *next; //4 bytes - volatile PDEVICE_TD_INFO pTDInfo;//4 bytes - volatile u32 m_dwReserved2; + struct tagSTxSyncDesc *next __aligned(8); + volatile PDEVICE_TD_INFO pTDInfo __aligned(8); } __attribute__ ((__packed__)) STxSyncDesc, *PSTxSyncDesc; typedef const STxSyncDesc *PCSTxSyncDesc; |