From 44a4004670a47135fa4dcc0473d3d28c8fb3e922 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Tue, 19 Jul 2011 10:29:41 -0500 Subject: [PATCH] staging: rtl8192e: Convert typedef ACI_AIFSN to union aci_aifsn Remove typedef from union. Rename union. Rename uses. Signed-off-by: Larry Finger --- drivers/staging/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtl819x_Qos.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/r8192E_dev.c index d610de92b1d5..0c06e7b84408 100644 --- a/drivers/staging/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/r8192E_dev.c @@ -235,7 +235,7 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val) struct rtllib_qos_parameters *qos_parameters = &priv->rtllib->current_network.qos_data.parameters; u8 pAcParam = *((u8*)val); u32 eACI = pAcParam; - PACI_AIFSN pAciAifsn = (PACI_AIFSN)&(qos_parameters->aifs[0]); + union aci_aifsn *pAciAifsn = (union aci_aifsn *)&(qos_parameters->aifs[0]); u8 acm = pAciAifsn->f.acm; u8 AcmCtrl = read_nic_byte( dev, AcmHwCtrl); diff --git a/drivers/staging/rtl8192e/rtl819x_Qos.h b/drivers/staging/rtl8192e/rtl819x_Qos.h index e063ed812c9f..af5c627941a3 100644 --- a/drivers/staging/rtl8192e/rtl819x_Qos.h +++ b/drivers/staging/rtl8192e/rtl819x_Qos.h @@ -375,7 +375,7 @@ struct bss_qos { #define IsACValid(ac) ( ( ac>=0 && ac<=7 )? true : false ) -typedef union _ACI_AIFSN{ +union aci_aifsn { u8 charData; struct @@ -385,7 +385,7 @@ typedef union _ACI_AIFSN{ u8 ACI:2; u8 Reserved:1; }f; -}ACI_AIFSN, *PACI_AIFSN; +}; typedef union _ECW{ u8 charData; @@ -402,7 +402,7 @@ typedef union _AC_PARAM{ struct { - ACI_AIFSN AciAifsn; + union aci_aifsn AciAifsn; ECW Ecw; u16 TXOPLimit; }f; -- 2.30.2