Ticket #1679: I-did-not-read-the-ticket_madwifi-eee-2.6.24.patch

madwifi-eee/ath/if_ath.c

@@ -9408 +9408 @@
-        if (write) {
-                ret = ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos);
-                if (ret == 0) {
-ctl->ctl_name
+(long)ctl->extra2
-                        case ATH_SLOTTIME:
-                                if (val > 0) {
-                                        if (!ath_hal_setslottime(ah, val))
@@ -9520 +9520 @@
-                        }
-                }
-        } else {
-ctl->ctl_name
+(long)ctl->extra2
-                case ATH_SLOTTIME:
-                        val = ath_hal_getslottime(ah);
-                        break;
@@ -9586 +9586 @@
-static int mincalibrate = 1;                    /* once a second */
-static int maxint = 0x7fffffff;         /* 32-bit big */
-
-#define CTL_AUTO        -2      /* cannot be CTL_ANY or CTL_NONE */
-
-static const ctl_table ath_sysctl_template[] = {
-ATH_SLOTTIME
+CTL_AUTO
-          .procname     = "slottime",
-          .mode         = 0644,
-
+
+
-        },
-ATH_ACKTIMEOUT
+CTL_AUTO
-          .procname     = "acktimeout",
-          .mode         = 0644,
-
+
+
-        },
-ATH_CTSTIMEOUT
+CTL_AUTO
-          .procname     = "ctstimeout",
-          .mode         = 0644,
-
+
+
-        },
-ATH_SOFTLED
+CTL_AUTO
-          .procname     = "softled",
-          .mode         = 0644,
-
+
+
-        },
-ATH_LEDPIN
+CTL_AUTO
-          .procname     = "ledpin",
-          .mode         = 0644,
-
+
+
-        },
-ATH_COUNTRYCODE
+CTL_AUTO
-          .procname     = "countrycode",
-          .mode         = 0444,
-
+
+
-        },
-ATH_REGDOMAIN
+CTL_AUTO
-          .procname     = "regdomain",
-          .mode         = 0444,
-
+
+
-        },
-#ifdef AR_DEBUG
-ATH_DEBUG
+CTL_AUTO
-          .procname     = "debug",
-          .mode         = 0644,
-
+
+
-        },
-#endif
-ATH_TXANTENNA
+CTL_AUTO
-          .procname     = "txantenna",
-          .mode         = 0644,
-
+
+
-        },
-ATH_RXANTENNA
+CTL_AUTO
-          .procname     = "rxantenna",
-          .mode         = 0644,
-
+
+
-        },
-ATH_DIVERSITY
+CTL_AUTO
-          .procname     = "diversity",
-          .mode         = 0644,
-
+
+
-        },
-ATH_TXINTRPERIOD
+CTL_AUTO
-          .procname     = "txintrperiod",
-          .mode         = 0644,
-
+
+
-        },
-ATH_FFTXQMIN
+CTL_AUTO
-          .procname     = "fftxqmin",
-          .mode         = 0644,
-
+
+
-        },
-#ifdef ATH_SUPERG_XR
-ATH_XR_POLL_PERIOD
+CTL_AUTO
-          .procname     = "xrpollperiod",
-          .mode         = 0644,
-
+
+
-        },
-ATH_XR_POLL_COUNT
+CTL_AUTO
-          .procname     = "xrpollcount",
-          .mode         = 0644,
-
+
+
-        },
-#endif
-ATH_ACKRATE
+CTL_AUTO
-          .procname     = "ackrate",
-          .mode         = 0644,
-
+
+
-        },
-        { 0 }
-};
@@ -9720 +9734 @@
-                sizeof(ath_sysctl_template));
-
-        /* add in dynamic data references */
-ctl_
+proc
-                if (sc->sc_sysctls[i].extra1 == NULL)
-                        sc->sc_sysctls[i].extra1 = sc;
-
@@ -9728 +9742 @@
-        sc->sc_sysctl_header = ATH_REGISTER_SYSCTL_TABLE(sc->sc_sysctls);
-        if (!sc->sc_sysctl_header) {
-                printk("%s: failed to register sysctls!\n", DEV_NAME(sc->sc_dev));
+                kfree(dev_name);
-                kfree(sc->sc_sysctls);
-                sc->sc_sysctls = NULL;
-        }
@@ -9746 +9761 @@
-                sc->sc_sysctl_header = NULL;
-        }
-        if (sc->sc_sysctls[2].procname) {
-
+ && sc->sc_sysctls
-                sc->sc_sysctls[2].procname = NULL;
-        }
-        if (sc->sc_sysctls) {
@@ -9810 +9825 @@
- * Static (i.e. global) sysctls.  Note that the HAL sysctls
- * are located under ours by sharing the setting for DEV_ATH.
- */
-enum {
-        DEV_ATH         = 9,                    /* XXX known by HAL */
-};
-
-static ctl_table ath_static_sysctls[] = {
-#ifdef AR_DEBUG
-        { .ctl_name     = CTL_AUTO,

madwifi-eee/ath/if_ath_pci.c

@@ -332 +332 @@
-
-MODULE_DEVICE_TABLE(pci, ath_pci_id_table);
-
-v_id
+iver
-        .name           = "ath_pci",
-        .id_table       = ath_pci_id_table,
-        .probe          = ath_pci_probe,
@@ -388 +388 @@
-{
-        printk(KERN_INFO "%s: %s\n", dev_info, version);
-
-v_id
+iver
-                printk("ath_pci: No devices found, driver not installed.\n");
-                return (-ENODEV);
-        }
@@ -401 +401 @@
-exit_ath_pci(void)
-{
-        ath_sysctl_unregister();
-v_id
+iver
-
-        printk(KERN_INFO "%s: driver unloaded\n", dev_info);
-}

madwifi-eee/ath_hal/ah_os.c

@@ -453 +453 @@
-}
-EXPORT_SYMBOL(ath_hal_memcmp);
-
-enum {
-        DEV_ATH         = 9,                    /* XXX must match driver */
-};
-
-#define CTL_AUTO        -2      /* cannot be CTL_ANY or CTL_NONE */
-
-static ctl_table ath_hal_sysctls[] = {
-#ifdef AH_DEBUG
-        { .ctl_name     = CTL_AUTO,

madwifi-eee/ath_hal/ah_target.inc

@@ -25 +25 @@
-
-# Determine the target (i.e. which HAL to use).
-# The default is $(ARCH)-elf
+TARGET-$(CONFIG_X86) = i386-elf
+TARGET-$(CONFIG_X86_64) = x86_64-elf
-TARGET-$(CONFIG_CPU_32v4) = armv4-$(ENDIAN)-elf
-TARGET-$(CONFIG_CPU_MIPS32_R1) = mips1-$(ENDIAN)-elf
-TARGET-$(CONFIG_CPU_MIPS32_R2) = mips-$(ENDIAN)-elf

madwifi-eee/ath_rate/amrr/amrr.c

@@ -485 +485 @@
-static int maxint = 0x7fffffff;         /* 32-bit big */
-static int min_threshold = 1;
-
-#define CTL_AUTO        -2      /* cannot be CTL_ANY or CTL_NONE */
-
-/*
- * Static (i.e. global) sysctls.
- */
-enum {
-        DEV_ATH         = 9,                    /* XXX known by many */
-};
-
-static ctl_table ath_rate_static_sysctls[] = {
-        { .ctl_name     = CTL_AUTO,
-          .procname     = "interval",

madwifi-eee/ath_rate/onoe/onoe.c

@@ -434 +434 @@
-static int minpercent = 0;              /* 0% */
-static int maxint = 0x7fffffff;         /* 32-bit big */
-
-#define CTL_AUTO        -2      /* cannot be CTL_ANY or CTL_NONE */
-
-/*
- * Static (i.e. global) sysctls.
- */
-enum {
-        DEV_ATH         = 9,                    /* XXX known by many */
-};
-
-static ctl_table ath_rate_static_sysctls[] = {
-        { .ctl_name     = CTL_AUTO,
-          .procname     = "interval",

madwifi-eee/include/compat.h

@@ -154 +154 @@
-        do { (_skb)->mac.raw = (_skb)->data; } while(0)
-#endif
-
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+#define CTL_AUTO -2
+#define DEV_ATH 9
+#else
+#define CTL_AUTO CTL_UNNUMBERED
+#define DEV_ATH CTL_UNNUMBERED
+#endif
+
-#endif /* __KERNEL__ */
-
-#endif /* _ATH_COMPAT_H_ */

madwifi-eee/net80211/ieee80211_linux.c

@@ -670 +670 @@
-        return ret;
-}
-
-#define CTL_AUTO        -2      /* cannot be CTL_ANY or CTL_NONE */
-
-static const ctl_table ieee80211_sysctl_template[] = {
-#ifdef IEEE80211_DEBUG
-        { .ctl_name     = CTL_AUTO,
@@ -776 +774 @@
-                sizeof(ieee80211_sysctl_template));
-
-        /* add in dynamic data references */
-ctl_
+proc
-                if (vap->iv_sysctls[i].extra1 == NULL)
-                        vap->iv_sysctls[i].extra1 = vap;
-
@@ -787 +785 @@
-        vap->iv_sysctl_header = ATH_REGISTER_SYSCTL_TABLE(vap->iv_sysctls);
-        if (!vap->iv_sysctl_header) {
-                printk("%s: failed to register sysctls!\n", vap->iv_dev->name);
+                kfree(devname);
-                kfree(vap->iv_sysctls);
-                vap->iv_sysctls = NULL;
-        }
@@ -936 +935 @@
-                proc_madwifi_count--;
-        }
-
-
+ && vap->iv_sysctls
-                kfree(vap->iv_sysctls[2].procname);
-                vap->iv_sysctls[2].procname = NULL;
-        }

madwifi-eee/scripts/get_arch.mk

@@ -36 +36 @@
-$(Cannot determine ARCH)
-endif
-
+# Allow ARCH to be x86
+ifneq (,$(CONFIG_X86))
+ifeq (x86,$(ARCH))
+ARCH-y = $(ARCH)
+endif
+endif
+
-# Don't allow ARCH to be overridden by a different value.
-ifeq (,$(ARCH))
-ARCH = $(ARCH-y)