Skip to content

Commit

Permalink
staging: rtl8192e: Convert typedef rx_fwinfo to struct rx_fwinfo
Browse files Browse the repository at this point in the history
Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
  • Loading branch information
Larry Finger authored and Larry Finger committed Aug 24, 2011
1 parent 4f534b3 commit 6f22c62
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/rtl8192e/r8190P_def.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -407,6 +407,6 @@ typedef struct _rx_fwinfo_819x_pci{

u32 TSFL;

}rx_fwinfo, *prx_fwinfo;
};//, *prx_fwinfo;

#endif
10 changes: 5 additions & 5 deletions drivers/staging/rtl8192e/r8192E_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 6f22c62

Please sign in to comment.