Staging: rtl8192e: Convert macros to inline functions

Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Mike McCormack 2010-09-24 18:40:01 +09:00 committed by Greg Kroah-Hartman
parent a922a4b778
commit 52cab756a2
2 changed files with 13 additions and 14 deletions

View File

@ -41,9 +41,11 @@ typedef struct _RT_DOT11D_INFO {
DOT11D_STATE State;
} RT_DOT11D_INFO, *PRT_DOT11D_INFO;
#define eqMacAddr(a, b) (((a)[0] == (b)[0] && (a)[1] == (b)[1] && (a)[2] == \
(b)[2] && (a)[3] == (b)[3] && (a)[4] == (b)[4] && \
(a)[5] == (b)[5]) ? 1 : 0)
static inline bool eqMacAddr(u8 *a, u8 *b)
{
return a[0] == b[0] && a[1] == b[1] && a[2] == b[2] &&
a[3] == b[3] && a[4] == b[4] && a[5] == b[5];
}
#define cpMacAddr(des, src) ((des)[0] = (src)[0], (des)[1] = (src)[1], \
(des)[2] = (src)[2], (des)[3] = (src)[3], \

View File

@ -237,17 +237,14 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv* priv)
}
#endif
#define eqMacAddr(a,b) ( ((a)[0]==(b)[0] && (a)[1]==(b)[1] && (a)[2]==(b)[2] && (a)[3]==(b)[3] && (a)[4]==(b)[4] && (a)[5]==(b)[5]) ? 1:0 )
#define rx_hal_is_cck_rate(_pdrvinfo)\
(_pdrvinfo->RxRate == DESC90_RATE1M ||\
_pdrvinfo->RxRate == DESC90_RATE2M ||\
_pdrvinfo->RxRate == DESC90_RATE5_5M ||\
_pdrvinfo->RxRate == DESC90_RATE11M) &&\
!_pdrvinfo->RxHT\
static inline bool rx_hal_is_cck_rate(prx_fwinfo_819x_pci pdrvinfo)
{
return (pdrvinfo->RxRate == DESC90_RATE1M ||
pdrvinfo->RxRate == DESC90_RATE2M ||
pdrvinfo->RxRate == DESC90_RATE5_5M ||
pdrvinfo->RxRate == DESC90_RATE11M) &&
!pdrvinfo->RxHT;
}
void CamResetAllEntry(struct net_device *dev)
{