[Prism54-devel] [PATCH] isl_ioctl.c, islpci_mgt.c: MODULE_PARAM compatibility code for kernel below 2.4.25
Martin Dummer
md11@epost.de
Sat, 13 Mar 2004 21:22:48 +0100
This is a multi-part message in MIME format.
------=_NextPart_000_02D4_01C40941.5133F3E0
Content-Type: text/plain;
charset="us-ascii"
Content-Transfer-Encoding: 7bit
I found the following in CHANGELOG:
2004-03-10 Luis R. Rodriguez <mcgrof@ruslug.rutgers.edu>
[...]
* isl_ioctl.c, islpci_mgt.c: move from MODULE_PARAM to the new
module_param, which is type-safe. Includes the new
<linux/moduleparam.h>. Note: this change breaks compatibility
of the code for older kernels (<2.4.25).
This let me examine the new code and offer some changes here to keep
compatibility for older kernels.
I know it looks ugly but I need it....
Martin
diff -Naur prism54-cvs20040313.org/ksrc/isl_ioctl.c
prism54-cvs20040313.new/ksrc/isl_ioctl.c
--- prism54-cvs20040313.org/ksrc/isl_ioctl.c Wed Mar 10 22:24:16 2004
+++ prism54-cvs20040313.new/ksrc/isl_ioctl.c Sat Mar 13 10:24:18 2004
@@ -25,7 +25,9 @@
#include <linux/kernel.h>
#include <linux/if_arp.h>
#include <linux/pci.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,25)
#include <linux/moduleparam.h>
+#endif
#include <asm/uaccess.h>
@@ -47,32 +49,59 @@
static int init_conformance = CARD_DEFAULT_CONFORMANCE;
static int init_mlme = CARD_DEFAULT_MLME_MODE;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,25)
module_param(init_mode, int, 0);
+#else
+MODULE_PARM(init_mode, "i");
+#endif
MODULE_PARM_DESC(init_mode,
"Set card mode:\n0: Auto\n1: Ad-Hoc\n2: Managed Client
(Default)\n3: Master / Access Point\n4: Repeater (Not supported yet)\n5:
Secondary (Not supported yet)\n6: Monitor");
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,25)
module_param(init_channel, int, 0);
+#else
+MODULE_PARM(init_channel, "i");
+#endif
MODULE_PARM_DESC(init_channel,
"Check `iwpriv ethx channel` for available channels");
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,25)
module_param(init_wep, int, 0);
module_param(init_filter, int, 0);
module_param(init_authen, int, 0);
+#else
+MODULE_PARM(init_wep, "i");
+MODULE_PARM(init_filter, "i");
+
+MODULE_PARM(init_authen, "i");
+#endif
MODULE_PARM_DESC(init_authen,
"Authentication method. Can be of seven types:\n0 0x0000:
None\n1 0x0001: DOT11_AUTH_OS (Default)\n2 0x0002: DOT11_AUTH_SK\n3
0x0003: DOT11_AUTH_BOTH");
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,25)
module_param(init_dot1x, int, 0);
+#else
+MODULE_PARM(init_dot1x, "i");
+#endif
MODULE_PARM_DESC(init_dot1x,
"\n0: None/not set (Default)\n1:
DOT11_DOT1X_AUTHENABLED\n2: DOT11_DOT1X_KEYTXENABLED");
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,25)
module_param(init_mlme, int, 0);
+#else
+MODULE_PARM(init_mlme, "i");
+#endif
MODULE_PARM_DESC(init_mlme,
"Sets the MAC layer management entity (MLME) mode of
operation,\n0: DOT11_MLME_AUTO (Default)\n1: DOT11_MLME_INTERMEDIATE\n2:
DOT11_MLME_EXTENDED");
#ifdef CONFIG_PRISM54_WDS
int init_wds = CARD_DEFAULT_WDS;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,25)
module_param(init_wds, int, 0);
+#else
+MODULE_PARM(init_wds, "i");
+#endif
#endif
/**
diff -Naur prism54-cvs20040313.org/ksrc/islpci_mgt.c
prism54-cvs20040313.new/ksrc/islpci_mgt.c
--- prism54-cvs20040313.org/ksrc/islpci_mgt.c Wed Mar 10 22:24:16 2004
+++ prism54-cvs20040313.new/ksrc/islpci_mgt.c Sat Mar 13 10:07:16 2004
@@ -22,7 +22,9 @@
#include <linux/netdevice.h>
#include <linux/module.h>
#include <linux/pci.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,25)
#include <linux/moduleparam.h>
+#endif
#include <asm/io.h>
#include <asm/system.h>
@@ -56,7 +58,11 @@
Global variable definition section
**************************************************************************
****/
int pc_debug = VERBOSE;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,25)
module_param(pc_debug, int, 0);
+#else
+MODULE_PARM(pc_debug, "i");
+#endif
/*************************************************************************
*****
Driver general functions
------=_NextPart_000_02D4_01C40941.5133F3E0
Content-Type: application/x-pkcs7-signature;
name="smime.p7s"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
filename="smime.p7s"
MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIJWDCCAuAw
ggJJoAMCAQICAwsjETANBgkqhkiG9w0BAQQFADBiMQswCQYDVQQGEwJaQTElMCMGA1UEChMcVGhh
d3RlIENvbnN1bHRpbmcgKFB0eSkgTHRkLjEsMCoGA1UEAxMjVGhhd3RlIFBlcnNvbmFsIEZyZWVt
YWlsIElzc3VpbmcgQ0EwHhcNMDMxMTEzMDY1MzM2WhcNMDQxMTEyMDY1MzM2WjBYMQ8wDQYDVQQE
EwZEdW1tZXIxDzANBgNVBCoTBk1hcnRpbjEWMBQGA1UEAxMNTWFydGluIER1bW1lcjEcMBoGCSqG
SIb3DQEJARYNbWQxMUBlcG9zdC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANEC
wlRvRq63+5JgLR671FT0lEGkoSciwv9/Fhw0VUZD/DoPRunyxtMx+XMgfDR6IAYp1yuBsv9V354+
IGlV46v8IlA23itI7K7xArnjiAgBNArgw49kLxktD3hUaU3vX+FmMKjn8amRDDIES1iP5GYVlcbr
tL+pEPi7wqn/JsysyM1NyozKMq1mEfVW1+XhSMEFzjymnWeuHCQS6et834n2BjrcOp42egZkl0N4
1bvBjv8jtSNVweBfq23H02d2NNPpYjLbSLqqAalulrgB9RvNI022of8Fx7ZzgS+MnT7EzhghPmSS
g58f7R5jItEK/TKTp1sTb0AfaJ3r8y9ilQcCAwEAAaMqMCgwGAYDVR0RBBEwD4ENbWQxMUBlcG9z
dC5kZTAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBBAUAA4GBACWWMfnnh+4mn2aGPQoflYPXHCaQ
TQ0q4FWCYngOYMYkr8BLPZVdDi6ldBhwSSFQfX6t3Ya9oqiDW9/B6UCU+ei778SvD61DRMvt35fC
23RjamXRvF73i6DWpY8Yrlip4I9JHn3ViZ1ncYurx7PCaW48FpJg+iEzDQegrXHh7AT5MIIDLTCC
ApagAwIBAgIBADANBgkqhkiG9w0BAQQFADCB0TELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rl
cm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMRowGAYDVQQKExFUaGF3dGUgQ29uc3VsdGluZzEo
MCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEkMCIGA1UEAxMbVGhhd3Rl
IFBlcnNvbmFsIEZyZWVtYWlsIENBMSswKQYJKoZIhvcNAQkBFhxwZXJzb25hbC1mcmVlbWFpbEB0
aGF3dGUuY29tMB4XDTk2MDEwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgdExCzAJBgNVBAYTAlpB
MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEaMBgGA1UEChMRVGhh
d3RlIENvbnN1bHRpbmcxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2aXNpb24x
JDAiBgNVBAMTG1RoYXd0ZSBQZXJzb25hbCBGcmVlbWFpbCBDQTErMCkGCSqGSIb3DQEJARYccGVy
c29uYWwtZnJlZW1haWxAdGhhd3RlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA1GnX
1LCUZFtx6UfYDFG26nKRsIRefS0Nj3sS34UldSh0OkIsYyeflXtL734Zhx2G6qPduc6WZBrCFG5E
rHzmj+hND3EfQDimAKOHePb5lIZererAXnbr2RSjXW56fAylS1V/Bhkpf56aJtVquzgkCGqYx7Ha
o5iR/Xnb5VrEHLkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQDH
7JJ+Tvj1lqVnYiqk8E0RYNBvjWBYYawmu1I1XAjPMPuoSpaKH2JCI4wXD/S6ZJwXrEcp352YXtJs
YHFcoqzceePnbgBHH7UNKOgCneSa/RP0ptl8sfjcXyMmCZGAc9AUG95DqYMl8uacLxXK/qarigd1
iwzdUYRr5PjRzneigTCCAz8wggKooAMCAQICAQ0wDQYJKoZIhvcNAQEFBQAwgdExCzAJBgNVBAYT
AlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEaMBgGA1UEChMR
VGhhd3RlIENvbnN1bHRpbmcxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2aXNp
b24xJDAiBgNVBAMTG1RoYXd0ZSBQZXJzb25hbCBGcmVlbWFpbCBDQTErMCkGCSqGSIb3DQEJARYc
cGVyc29uYWwtZnJlZW1haWxAdGhhd3RlLmNvbTAeFw0wMzA3MTcwMDAwMDBaFw0xMzA3MTYyMzU5
NTlaMGIxCzAJBgNVBAYTAlpBMSUwIwYDVQQKExxUaGF3dGUgQ29uc3VsdGluZyAoUHR5KSBMdGQu
MSwwKgYDVQQDEyNUaGF3dGUgUGVyc29uYWwgRnJlZW1haWwgSXNzdWluZyBDQTCBnzANBgkqhkiG
9w0BAQEFAAOBjQAwgYkCgYEAxKY8VXNV+065yplaHmjAdQRwnd/p/6Me7L3N9VvyGna9fww6YfK/
Uc4B1OVQCjDXAmNaLIkVcI7dyfArhVqqP3FWy688Cwfn8R+RNiQqE88r1fOCdz0Dviv+uxg+B79A
gAJk16emu59l0cUqVIUPSAR/p7bRPGEEQB5kGXJgt/sCAwEAAaOBlDCBkTASBgNVHRMBAf8ECDAG
AQH/AgEAMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwudGhhd3RlLmNvbS9UaGF3dGVQZXJz
b25hbEZyZWVtYWlsQ0EuY3JsMAsGA1UdDwQEAwIBBjApBgNVHREEIjAgpB4wHDEaMBgGA1UEAxMR
UHJpdmF0ZUxhYmVsMi0xMzgwDQYJKoZIhvcNAQEFBQADgYEASIzRUIPqCy7MDaNmrGcPf6+svsIX
oUOWlJ1/TCG4+DYfqi2fNi/A9BxQIJNwPP2t4WFiw9k6GX6EsZkbAMUaC4J0niVQlGLH2ydxVyWN
3amcOY6MIE9lX5Xa9/eH1sYITq726jTlEBpbNU1341YheILcIRk13iSx0x1G/11fZU8xggNQMIID
TAIBATBpMGIxCzAJBgNVBAYTAlpBMSUwIwYDVQQKExxUaGF3dGUgQ29uc3VsdGluZyAoUHR5KSBM
dGQuMSwwKgYDVQQDEyNUaGF3dGUgUGVyc29uYWwgRnJlZW1haWwgSXNzdWluZyBDQQIDCyMRMAkG
BSsOAwIaBQCgggG8MBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTA0
MDMxMzIwMjI0MVowIwYJKoZIhvcNAQkEMRYEFFpnV+mRhfKW6InkY8aJnFH0r+f6MGcGCSqGSIb3
DQEJDzFaMFgwCgYIKoZIhvcNAwcwDgYIKoZIhvcNAwICAgCAMA0GCCqGSIb3DQMCAgFAMAcGBSsO
AwIHMA0GCCqGSIb3DQMCAgEoMAcGBSsOAwIaMAoGCCqGSIb3DQIFMHgGCSsGAQQBgjcQBDFrMGkw
YjELMAkGA1UEBhMCWkExJTAjBgNVBAoTHFRoYXd0ZSBDb25zdWx0aW5nIChQdHkpIEx0ZC4xLDAq
BgNVBAMTI1RoYXd0ZSBQZXJzb25hbCBGcmVlbWFpbCBJc3N1aW5nIENBAgMLIxEwegYLKoZIhvcN
AQkQAgsxa6BpMGIxCzAJBgNVBAYTAlpBMSUwIwYDVQQKExxUaGF3dGUgQ29uc3VsdGluZyAoUHR5
KSBMdGQuMSwwKgYDVQQDEyNUaGF3dGUgUGVyc29uYWwgRnJlZW1haWwgSXNzdWluZyBDQQIDCyMR
MA0GCSqGSIb3DQEBAQUABIIBAEhDObvhnkZjg8S6N18eCrvbvMQclpPs9jS2hviyVxKK2TP/4Gme
tbRn2UT5YtfSf/OYIX8VHP4ScVPDzLL6dh8uQkGf1LJifvEqw52mlD+JH55+MrYBHsZg1i+nL3YX
ESelErTLoTIBI55L/PWt7ldLrZjmnzUnJf01QAyXDtDaNYp/cjYReG70oJru2UlxyZ+PkPIvxMl2
VPeoYtx2cnOnI8/2PHCQot2BdRyEZvLVRUHFaX623fLk5CS5bIHq3BIZ5MSYgITt3rprRSSdrPGI
oueheYLCOXSdSkQyc9qOOhdD+b/Ld/tjVwLq2BfQM6NmuxojQ7cEdbpMRr3KCjwAAAAAAAA=
------=_NextPart_000_02D4_01C40941.5133F3E0--