[Madwifi-cvs] revision 1988 committed
Status: Beta
Brought to you by:
otaku
Menu
▾
▴
[Madwifi-cvs] revision 1988 committed
|
From: Pavel R. <svn...@ma...> - 2007-01-22 03:07:47
|
Project : madwifi
Revision : 1988
Author : proski (Pavel Roskin)
Date : 2007-01-22 04:07:30 +0100 (Mon, 22 Jan 2007)
Log Message :
Remove references to CONFIG_SYSCTL and CONFIG_NET_WIRELESS
Both are required, and adding support for configurations without sysctl
or wireless extensions would be a waste of time at this point.
Just don't pretend it can be done easily, and clean up the code a bit.
Affected Files:
* trunk/ath/if_ath.c updated
* trunk/ath/if_ath_ahb.c updated
* trunk/ath/if_ath_pci.c updated
* trunk/ath/if_athvar.h updated
* trunk/ath_hal/ah_os.c updated
* trunk/ath_rate/amrr/amrr.c updated
* trunk/ath_rate/onoe/onoe.c updated
* trunk/ath_rate/sample/sample.c updated
* trunk/net80211/ieee80211_input.c updated
* trunk/net80211/ieee80211_linux.c updated
* trunk/net80211/ieee80211_linux.h updated
* trunk/net80211/ieee80211_var.h updated
* trunk/net80211/ieee80211_wireless.c updated
Modified: trunk/ath/if_ath.c
===================================================================
--- trunk/ath/if_ath.c 2007-01-22 01:18:26 UTC (rev 1987)
+++ trunk/ath/if_ath.c 2007-01-22 03:07:30 UTC (rev 1988)
@@ -239,10 +239,8 @@
#endif
static void ath_setcurmode(struct ath_softc *, enum ieee80211_phymode);
-#ifdef CONFIG_SYSCTL
static void ath_dynamic_sysctl_register(struct ath_softc *);
static void ath_dynamic_sysctl_unregister(struct ath_softc *);
-#endif /* CONFIG_SYSCTL */
static void ath_announce(struct net_device *);
static int ath_descdma_setup(struct ath_softc *, struct ath_descdma *,
ath_bufhead *, const char *, int, int);
@@ -875,9 +873,7 @@
* Attach dynamic MIB vars and announce support
* now that we have a device name with unit number.
*/
-#ifdef CONFIG_SYSCTL
ath_dynamic_sysctl_register(sc);
-#endif /* CONFIG_SYSCTL */
ieee80211_announce(ic);
ath_announce(dev);
#ifdef ATH_TX99_DIAG
@@ -980,9 +976,7 @@
ath_tx_cleanup(sc);
ath_hal_detach(ah);
-#ifdef CONFIG_SYSCTL
ath_dynamic_sysctl_unregister(sc);
-#endif /* CONFIG_SYSCTL */
ATH_LOCK_DESTROY(sc);
dev->stop = NULL; /* prevent calling ath_stop again */
unregister_netdev(dev);
@@ -9224,7 +9218,6 @@
return error;
}
-#ifdef CONFIG_SYSCTL
/*
* Sysctls are split into ``static'' and ``dynamic'' tables.
* The former are defined at module load time and are used
@@ -9768,7 +9761,6 @@
if (ath_sysctl_header)
unregister_sysctl_table(ath_sysctl_header);
}
-#endif /* CONFIG_SYSCTL */
static const char*
ath_get_hal_status_desc(HAL_STATUS status)
@@ -9783,7 +9775,6 @@
ath_rcv_dev_event(struct notifier_block *this, unsigned long event,
void *ptr)
{
-#ifdef CONFIG_SYSCTL
struct net_device *dev = (struct net_device *) ptr;
struct ath_softc *sc = (struct ath_softc *) dev->priv;
@@ -9798,6 +9789,5 @@
default:
break;
}
-#endif /* CONFIG_SYSCTL */
return 0;
}
Modified: trunk/ath/if_ath_ahb.c
===================================================================
--- trunk/ath/if_ath_ahb.c 2007-01-22 01:18:26 UTC (rev 1987)
+++ trunk/ath/if_ath_ahb.c 2007-01-22 03:07:30 UTC (rev 1988)
@@ -466,9 +466,7 @@
printk("ath_ahb: No devices found, driver not installed.\n");
return (-ENODEV);
}
-#ifdef CONFIG_SYSCTL
ath_sysctl_register();
-#endif
return 0;
}
module_init(init_ath_ahb);
@@ -476,9 +474,7 @@
static void __exit
exit_ath_ahb(void)
{
-#ifdef CONFIG_SYSCTL
ath_sysctl_unregister();
-#endif
exit_ath_wmac(AR531X_WLAN0_NUM);
exit_ath_wmac(AR531X_WLAN1_NUM);
Modified: trunk/ath/if_ath_pci.c
===================================================================
--- trunk/ath/if_ath_pci.c 2007-01-22 01:18:26 UTC (rev 1987)
+++ trunk/ath/if_ath_pci.c 2007-01-22 03:07:30 UTC (rev 1988)
@@ -385,9 +385,7 @@
printk("ath_pci: No devices found, driver not installed.\n");
return (-ENODEV);
}
-#ifdef CONFIG_SYSCTL
ath_sysctl_register();
-#endif
return (0);
}
module_init(init_ath_pci);
@@ -395,9 +393,7 @@
static void __exit
exit_ath_pci(void)
{
-#ifdef CONFIG_SYSCTL
ath_sysctl_unregister();
-#endif
pci_unregister_driver(&ath_pci_drv_id);
printk(KERN_INFO "%s: driver unloaded\n", dev_info);
Modified: trunk/ath/if_athvar.h
===================================================================
--- trunk/ath/if_athvar.h 2007-01-22 01:18:26 UTC (rev 1987)
+++ trunk/ath/if_athvar.h 2007-01-22 03:07:30 UTC (rev 1988)
@@ -659,10 +659,8 @@
HAL_NODE_STATS sc_halstats; /* station-mode rssi stats */
struct ATH_WORK_THREAD sc_radartask; /* Schedule task for DFS handling */
-#ifdef CONFIG_SYSCTL
struct ctl_table_header *sc_sysctl_header;
struct ctl_table *sc_sysctls;
-#endif
u_int16_t sc_reapcount; /* # of tx buffers reaped after net dev stopped */
@@ -738,10 +736,8 @@
#endif
int ath_ioctl_ethtool(struct ath_softc *, int, void __user *);
void bus_read_cachesize(struct ath_softc *, u_int8_t *);
-#ifdef CONFIG_SYSCTL
void ath_sysctl_register(void);
void ath_sysctl_unregister(void);
-#endif /* CONFIG_SYSCTL */
/*
* HAL definitions to comply with local coding convention.
Modified: trunk/ath_hal/ah_os.c
===================================================================
--- trunk/ath_hal/ah_os.c 2007-01-22 01:18:26 UTC (rev 1987)
+++ trunk/ath_hal/ah_os.c 2007-01-22 03:07:30 UTC (rev 1988)
@@ -431,7 +431,6 @@
}
EXPORT_SYMBOL(ath_hal_memcmp);
-#ifdef CONFIG_SYSCTL
enum {
DEV_ATH = 9, /* XXX must match driver */
};
@@ -533,7 +532,6 @@
if (ath_hal_sysctl_header)
unregister_sysctl_table(ath_hal_sysctl_header);
}
-#endif /* CONFIG_SYSCTL */
/*
* Module glue.
@@ -573,9 +571,7 @@
sep = ", ";
}
printk(")\n");
-#ifdef CONFIG_SYSCTL
ath_hal_sysctl_register();
-#endif
return (0);
}
module_init(init_ath_hal);
@@ -583,9 +579,7 @@
static void __exit
exit_ath_hal(void)
{
-#ifdef CONFIG_SYSCTL
ath_hal_sysctl_unregister();
-#endif
printk(KERN_INFO "%s: driver unloaded\n", dev_info);
}
module_exit(exit_ath_hal);
Modified: trunk/ath_rate/amrr/amrr.c
===================================================================
--- trunk/ath_rate/amrr/amrr.c 2007-01-22 01:18:26 UTC (rev 1987)
+++ trunk/ath_rate/amrr/amrr.c 2007-01-22 03:07:30 UTC (rev 1988)
@@ -580,9 +580,7 @@
if (ret)
return ret;
-#ifdef CONFIG_SYSCTL
ath_sysctl_header = register_sysctl_table(ath_root_table, 1);
-#endif
return (0);
}
module_init(init_ath_rate_amrr);
@@ -590,10 +588,8 @@
static void __exit
exit_ath_rate_amrr(void)
{
-#ifdef CONFIG_SYSCTL
if (ath_sysctl_header != NULL)
unregister_sysctl_table(ath_sysctl_header);
-#endif
ieee80211_rate_unregister(&ath_rate_ops);
printk(KERN_INFO "%s: unloaded\n", dev_info);
Modified: trunk/ath_rate/onoe/onoe.c
===================================================================
--- trunk/ath_rate/onoe/onoe.c 2007-01-22 01:18:26 UTC (rev 1987)
+++ trunk/ath_rate/onoe/onoe.c 2007-01-22 03:07:30 UTC (rev 1988)
@@ -527,9 +527,7 @@
if (ret)
return ret;
-#ifdef CONFIG_SYSCTL
ath_sysctl_header = register_sysctl_table(ath_root_table, 1);
-#endif
return (0);
}
module_init(init_ath_rate_onoe);
@@ -537,10 +535,8 @@
static void __exit
exit_ath_rate_onoe(void)
{
-#ifdef CONFIG_SYSCTL
if (ath_sysctl_header != NULL)
unregister_sysctl_table(ath_sysctl_header);
-#endif
ieee80211_rate_unregister(&ath_rate_ops);
printk(KERN_INFO "%s: unloaded\n", dev_info);
Modified: trunk/ath_rate/sample/sample.c
===================================================================
--- trunk/ath_rate/sample/sample.c 2007-01-22 01:18:26 UTC (rev 1987)
+++ trunk/ath_rate/sample/sample.c 2007-01-22 03:07:30 UTC (rev 1988)
@@ -934,7 +934,6 @@
_MOD_DEC_USE(THIS_MODULE);
}
-#ifdef CONFIG_SYSCTL
static int
proc_read_nodes(struct ieee80211vap *vap, const int size, char *buf, int space)
{
@@ -1054,7 +1053,6 @@
ieee80211_proc_vcreate(vap, &proc_ratesample_ops, "ratestats_1600");
ieee80211_proc_vcreate(vap, &proc_ratesample_ops, "ratestats_3000");
}
-#endif /* CONFIG_SYSCTL */
static struct ieee80211_rate_ops ath_rate_ops = {
.ratectl_id = IEEE80211_RATE_SAMPLE,
Modified: trunk/net80211/ieee80211_input.c
===================================================================
--- trunk/net80211/ieee80211_input.c 2007-01-22 01:18:26 UTC (rev 1987)
+++ trunk/net80211/ieee80211_input.c 2007-01-22 03:07:30 UTC (rev 1988)
@@ -132,7 +132,6 @@
#endif
/* Enhanced iwspy support */
-#ifdef CONFIG_NET_WIRELESS
#if WIRELESS_EXT >= 16
#ifndef IW_QUAL_QUAL_UPDATED
@@ -203,7 +202,6 @@
#endif /* WIRELESS_EXT >= 16 */
#else
#define iwspy_event(_vap, _ni, _rssi)
-#endif /* CONFIG_NET_WIRELESS */
/*
* Process a received frame. The node associated with the sender
Modified: trunk/net80211/ieee80211_linux.c
===================================================================
--- trunk/net80211/ieee80211_linux.c 2007-01-22 01:18:26 UTC (rev 1987)
+++ trunk/net80211/ieee80211_linux.c 2007-01-22 03:07:30 UTC (rev 1988)
@@ -338,7 +338,6 @@
return rv;
}
-#ifdef CONFIG_SYSCTL
static struct proc_dir_entry *proc_madwifi;
static int proc_madwifi_count = 0;
@@ -862,7 +861,6 @@
vap->iv_sysctls = NULL;
}
}
-#endif /* CONFIG_SYSCTL */
/*
* Format an Ethernet MAC for printing.
@@ -887,7 +885,6 @@
ieee80211_rcv_dev_event(struct notifier_block *this, unsigned long event,
void *ptr)
{
-#ifdef CONFIG_SYSCTL
struct net_device *dev = (struct net_device *) ptr;
if (!dev || dev->open != &ieee80211_open)
return 0;
@@ -900,7 +897,6 @@
default:
break;
}
-#endif /* CONFIG_SYSCTL */
return 0;
}
Modified: trunk/net80211/ieee80211_linux.h
===================================================================
--- trunk/net80211/ieee80211_linux.h 2007-01-22 01:18:26 UTC (rev 1987)
+++ trunk/net80211/ieee80211_linux.h 2007-01-22 03:07:30 UTC (rev 1988)
@@ -29,9 +29,7 @@
#ifndef _NET80211_IEEE80211_LINUX_H_
#define _NET80211_IEEE80211_LINUX_H_
-#ifdef CONFIG_NET_WIRELESS
#include <linux/wireless.h>
-#endif
/*
* Task deferral
@@ -464,7 +462,6 @@
#endif
-#ifdef CONFIG_SYSCTL
/*
* Deal with the sysctl handler api changing.
*/
@@ -487,7 +484,6 @@
int ieee80211_proc_vcreate(struct ieee80211vap *, struct file_operations *,
char *);
void ieee80211_proc_cleanup(struct ieee80211vap *);
-#endif /* CONFIG_SYSCTL */
#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
#define IEEE80211_VLAN_TAG_USED 1
Modified: trunk/net80211/ieee80211_var.h
===================================================================
--- trunk/net80211/ieee80211_var.h 2007-01-22 01:18:26 UTC (rev 1987)
+++ trunk/net80211/ieee80211_var.h 2007-01-22 03:07:30 UTC (rev 1988)
@@ -271,7 +271,6 @@
u_int8_t num;
};
-#ifdef CONFIG_SYSCTL
#define MAX_PROC_IEEE80211_SIZE 16383
#define PROC_IEEE80211_PERM 0644
@@ -291,7 +290,6 @@
struct proc_dir_entry *entry;
struct ieee80211_proc_entry *next;
};
-#endif
struct ieee80211_app_ie_t {
u_int32_t length; /* buffer length */
@@ -302,15 +300,11 @@
struct net_device *iv_dev; /* associated device */
struct net_device_stats iv_devstats; /* interface statistics */
struct ifmedia iv_media; /* interface media config */
-#ifdef CONFIG_NET_WIRELESS
struct iw_statistics iv_iwstats; /* wireless statistics block */
-#endif
-#ifdef CONFIG_SYSCTL
struct ctl_table_header *iv_sysctl_header;
struct ctl_table *iv_sysctls;
struct proc_dir_entry *iv_proc;
struct ieee80211_proc_entry *iv_proc_entries;
-#endif
struct vlan_group *iv_vlgrp; /* vlan group state */
TAILQ_ENTRY(ieee80211vap) iv_next; /* list of vap instances */
Modified: trunk/net80211/ieee80211_wireless.c
===================================================================
--- trunk/net80211/ieee80211_wireless.c 2007-01-22 01:18:26 UTC (rev 1987)
+++ trunk/net80211/ieee80211_wireless.c 2007-01-22 03:07:30 UTC (rev 1988)
@@ -43,7 +43,6 @@
#include <linux/config.h>
#endif
-#ifdef CONFIG_NET_WIRELESS
#include <linux/version.h>
#include <linux/module.h>
#include <linux/netdevice.h>
@@ -5435,4 +5434,3 @@
ieee80211_delete_wlanunit(vap->iv_unit);
}
-#endif /* CONFIG_NET_WIRELESS */
|