[Madwifi-cvs] revision 1197 committed by br1
Status: Beta
Brought to you by:
otaku
From: br1 <svn...@ma...> - 2005-10-24 09:41:15
|
Project : madwifi Revision : 1197 Author : br1 Date : 2005-10-24 11:40:46 +0200 (Mon, 24 Oct 2005) Log Message : On RHEL 4 MODULE_PARM_ is marked deprecated in include/linux/module.h. That leads to a failed compile in ath/if_ath.c due to it using the MODULE_PARM(...) macro. (patch by Frank Schaeckermann) Affected Files: * trunk/ath/if_ath.c updated Modified: trunk/ath/if_ath.c =================================================================== --- trunk/ath/if_ath.c 2005-10-24 09:34:07 UTC (rev 1196) +++ trunk/ath/if_ath.c 2005-10-24 09:40:46 UTC (rev 1197) @@ -254,19 +254,29 @@ static int ath_xchanmode = AH_TRUE; /* enable extended channels */ static int countrycode = -1; +static int outdoor = -1; +static int xchanmode = -1; +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,52)) MODULE_PARM(countrycode, "i"); +MODULE_PARM(outdoor, "i"); +MODULE_PARM(xchanmode, "i"); +#else +module_param(countrycode, int, 0); +module_param(outdoor, int, 0); +module_param(xchanmode, int, 0); +#endif MODULE_PARM_DESC(countrycode, "Override default country code"); -static int outdoor = -1; -MODULE_PARM(outdoor, "i"); MODULE_PARM_DESC(outdoor, "Enable/disable outdoor use"); -static int xchanmode = -1; -MODULE_PARM(xchanmode, "i"); MODULE_PARM_DESC(xchanmode, "Enable/disable extended channel mode"); #ifdef AR_DEBUG int ath_debug = 0; +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,52)) MODULE_PARM(ath_debug, "i"); +#else +module_param(ath_debug, int, 0); +#endif MODULE_PARM_DESC(ath_debug, "Load-time debug output enable"); #define IFF_DUMPPKTS(sc, _m) \ |