From 6f22c62010122f73be5793e981db89401005a407 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Mon, 18 Jul 2011 22:56:46 -0500 Subject: [PATCH] staging: rtl8192e: Convert typedef rx_fwinfo to struct rx_fwinfo Remove typedef from struct. Rename struct. Rename uses. Signed-off-by: Larry Finger --- drivers/staging/rtl8192e/r8190P_def.h | 4 ++-- drivers/staging/rtl8192e/r8192E_dev.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/rtl8192e/r8190P_def.h b/drivers/staging/rtl8192e/r8190P_def.h index 228998a4a11..8fcb9ce1996 100644 --- a/drivers/staging/rtl8192e/r8190P_def.h +++ b/drivers/staging/rtl8192e/r8190P_def.h @@ -388,7 +388,7 @@ struct rx_desc { };//, *prx_desc; -typedef struct _rx_fwinfo_819x_pci{ +struct rx_fwinfo { u16 Reserved1:12; u16 PartAggr:1; u16 FirstAGGR:1; @@ -407,6 +407,6 @@ typedef struct _rx_fwinfo_819x_pci{ u32 TSFL; -}rx_fwinfo, *prx_fwinfo; +};//, *prx_fwinfo; #endif diff --git a/drivers/staging/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/r8192E_dev.c index 41f5add3dd1..1935c30da8a 100644 --- a/drivers/staging/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/r8192E_dev.c @@ -1397,7 +1397,7 @@ void rtl8192_query_rxphystatus( struct r8192_priv * priv, struct rtllib_rx_stats * pstats, struct rx_desc *pdesc, - prx_fwinfo pdrvinfo, + struct rx_fwinfo *pdrvinfo, struct rtllib_rx_stats * precord_stats, bool bpacket_match_bssid, bool bpacket_toself, @@ -1439,7 +1439,7 @@ void rtl8192_query_rxphystatus( prxpkt = (u8*)pdrvinfo; - prxpkt += sizeof(rx_fwinfo); + prxpkt += sizeof(struct rx_fwinfo); pcck_buf = (struct phy_sts_cck_819xpci *)prxpkt; pofdm_buf = (struct phy_sts_ofdm_819xpci *)prxpkt; @@ -1769,7 +1769,7 @@ void rtl8192_TranslateRxSignalStuff(struct net_device *dev, struct sk_buff *skb, struct rtllib_rx_stats * pstats, struct rx_desc *pdesc, - prx_fwinfo pdrvinfo) + struct rx_fwinfo *pdrvinfo) { struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); bool bpacket_match_bssid, bpacket_toself; @@ -1896,12 +1896,12 @@ bool rtl8192_rx_query_status_desc(struct net_device* dev, struct rtllib_rx_stats } return false; } else { - prx_fwinfo pDrvInfo = NULL; + struct rx_fwinfo *pDrvInfo = NULL; stats->RxDrvInfoSize = pdesc->RxDrvInfoSize; stats->RxBufShift = ((pdesc->Shift)&0x03); stats->Decrypted = !pdesc->SWDec; - pDrvInfo = (rx_fwinfo *)(skb->data + stats->RxBufShift); + pDrvInfo = (struct rx_fwinfo *)(skb->data + stats->RxBufShift); stats->rate = HwRateToMRate90((bool)pDrvInfo->RxHT, (u8)pDrvInfo->RxRate); stats->bShortPreamble = pDrvInfo->SPLCP; -- 2.39.5