[Madwifi-users] patch for 2.6.8-rc4

[Chris H. <cp...@zu...>]

No doubt this has already been noticed, but I didn't see any mail
about it in the archives.

Here's a patch to fix compilation problems with 2.6.8-rc4.  It needs
to be conditionalized to work with older kernels.


Index: ath/if_ath.c
===================================================================
RCS file: /cvsroot/madwifi/madwifi/ath/if_ath.c,v
retrieving revision 1.3
diff -u -r1.3 if_ath.c
--- ath/if_ath.c	5 Aug 2004 23:17:21 -0000	1.3
+++ ath/if_ath.c	10 Aug 2004 18:25:00 -0000
@@ -4626,7 +4626,7 @@
 
 static int
 ath_sysctl_halparam(ctl_table *ctl, int write, struct file *filp,
-	void *buffer, size_t *lenp)
+	void *buffer, size_t *lenp, loff_t *ppos)
 {
 	struct ath_softc *sc = ctl->extra1;
 	u_int val;
@@ -4635,7 +4635,7 @@
 	ctl->data = &val;
 	ctl->maxlen = sizeof(val);
 	if (write) {
-		ret = proc_dointvec(ctl, write, filp, buffer, lenp);
+		ret = proc_dointvec(ctl, write, filp, buffer, lenp, ppos);
 		if (ret == 0) {
 			switch (ctl->ctl_name) {
 			case ATH_SLOTTIME:
@@ -4687,7 +4687,7 @@
 		default:
 			return -EINVAL;
 		}
-		ret = proc_dointvec(ctl, write, filp, buffer, lenp);
+		ret = proc_dointvec(ctl, write, filp, buffer, lenp, ppos);
 	}
 	return ret;
 }
Index: net80211/ieee80211_linux.c
===================================================================
RCS file: /cvsroot/madwifi/madwifi/net80211/ieee80211_linux.c,v
retrieving revision 1.2
diff -u -r1.2 ieee80211_linux.c
--- net80211/ieee80211_linux.c	5 Aug 2004 17:34:54 -0000	1.2
+++ net80211/ieee80211_linux.c	10 Aug 2004 18:25:00 -0000
@@ -339,7 +339,7 @@
 
 static int
 ieee80211_sysctl_stations(ctl_table *ctl, int write, struct file *filp,
-	void *buffer, size_t *lenp)
+	void *buffer, size_t *lenp, loff_t *ppos)
 {
 	struct ieee80211com *ic = ctl->extra1;
 	int len = *lenp;
@@ -357,7 +357,7 @@
 
 static int
 ieee80211_sysctl_debug(ctl_table *ctl, int write, struct file *filp,
-	void *buffer, size_t *lenp)
+	void *buffer, size_t *lenp, loff_t *ppos)
 {
 	struct ieee80211com *ic = ctl->extra1;
 	u_int val;
@@ -366,12 +366,12 @@
 	ctl->data = &val;
 	ctl->maxlen = sizeof(val);
 	if (write) {
-		ret = proc_dointvec(ctl, write, filp, buffer, lenp);
+		ret = proc_dointvec(ctl, write, filp, buffer, lenp, ppos);
 		if (ret == 0)
 			ic->msg_enable = val;
 	} else {
 		val = ic->msg_enable;
-		ret = proc_dointvec(ctl, write, filp, buffer, lenp);
+		ret = proc_dointvec(ctl, write, filp, buffer, lenp, ppos);
 	}
 	return ret;
 }