u16 rxmsginbadmsgfrag;
 } __packed;
 
-typedef struct hfa384x_CommTallies32 {
+struct hfa384x_CommTallies32 {
        u32 txunicastframes;
        u32 txmulticastframes;
        u32 txfragments;
        u32 rxdiscardswepundecr;
        u32 rxmsginmsgfrag;
        u32 rxmsginbadmsgfrag;
-} __packed hfa384x_CommTallies32_t;
+} __packed;
 
 /*--  Inquiry Frame, Diagnose: Scan Results & Subfields--*/
 typedef struct hfa384x_ScanResultSub {
 /*--  Collection of all Inf frames ---------------*/
 typedef union hfa384x_infodata {
        struct hfa384x_CommTallies16 commtallies16;
-       hfa384x_CommTallies32_t commtallies32;
+       struct hfa384x_CommTallies32 commtallies32;
        hfa384x_ScanResult_t scanresult;
        hfa384x_ChInfoResult_t chinforesult;
        hfa384x_HScanResult_t hscanresult;
        struct hfa384x_caplevel cap_act_ap_mfi; /* ap f/w to modem interface */
 
        u32 psusercount;        /* Power save user count. */
-       hfa384x_CommTallies32_t tallies;        /* Communication tallies. */
+       struct hfa384x_CommTallies32 tallies;   /* Communication tallies. */
        u8 comment[WLAN_COMMENT_MAX + 1];       /* User comment */
 
        /* Channel Info request results (AP only) */
 
         * record length of the info record.
         */
 
-       cnt = sizeof(hfa384x_CommTallies32_t) / sizeof(u32);
+       cnt = sizeof(struct hfa384x_CommTallies32) / sizeof(u32);
        if (inf->framelen > 22) {
                dst = (u32 *)&hw->tallies;
                src32 = (u32 *)&inf->info.commtallies32;