[Madwifi-cvs] revision 1989 committed
Status: Beta
Brought to you by:
otaku
Menu
▾
▴
[Madwifi-cvs] revision 1989 committed
|
From: Pavel R. <svn...@ma...> - 2007-01-22 03:08:12
|
Project : madwifi
Revision : 1989
Author : proski (Pavel Roskin)
Date : 2007-01-22 04:07:57 +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:
* branches/madwifi-old-openhal/ath/if_ath.c updated
* branches/madwifi-old-openhal/ath/if_ath_pci.c updated
* branches/madwifi-old-openhal/ath/if_athrate.h updated
* branches/madwifi-old-openhal/ath/if_athvar.h updated
* branches/madwifi-old-openhal/ath_rate/amrr/amrr.c updated
* branches/madwifi-old-openhal/ath_rate/onoe/onoe.c updated
* branches/madwifi-old-openhal/ath_rate/sample/sample.c updated
* branches/madwifi-old-openhal/ath_rate/sample/sample.h updated
* branches/madwifi-old-openhal/net80211/ieee80211.c updated
* branches/madwifi-old-openhal/net80211/ieee80211_linux.c updated
* branches/madwifi-old-openhal/net80211/ieee80211_linux.h updated
* branches/madwifi-old-openhal/net80211/ieee80211_var.h updated
* branches/madwifi-old-openhal/net80211/ieee80211_wireless.c updated
Modified: branches/madwifi-old-openhal/ath/if_ath.c
===================================================================
--- branches/madwifi-old-openhal/ath/if_ath.c 2007-01-22 03:07:30 UTC (rev 1988)
+++ branches/madwifi-old-openhal/ath/if_ath.c 2007-01-22 03:07:57 UTC (rev 1989)
@@ -168,10 +168,8 @@
static void ath_vlan_kill_vid(struct net_device *, unsigned short );
#endif
static struct net_device_stats *ath_getstats(struct net_device *);
-#ifdef CONFIG_NET_WIRELESS
static struct iw_statistics *ath_iw_getstats(struct net_device *);
static struct iw_handler_def ath_iw_handler_def;
-#endif
static void ath_setup_stationkey(struct ieee80211_node *);
static void ath_newassoc(struct ieee80211com *,
struct ieee80211_node *, int);
@@ -190,10 +188,8 @@
static int ath_rawdev_attach(struct ath_softc *);
static void ath_rawdev_detach(struct ath_softc *);
-#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 ath_softc *);
static const char *hal_status_desc[] = {
@@ -569,14 +565,12 @@
dev->set_mac_address = ath_set_mac_address;
dev->change_mtu = &ath_change_mtu;
dev->tx_queue_len = ATH_TXBUF; /* TODO? 1 for mgmt frame */
-#ifdef CONFIG_NET_WIRELESS
/*get_wireless_stats moved from net_device to iw_handler_def*/
# if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
dev->get_wireless_stats = ath_iw_getstats;
# endif
ieee80211_ioctl_iwsetup(&ath_iw_handler_def);
dev->wireless_handlers = &ath_iw_handler_def;
-#endif /* CONFIG_NET_WIRELESS */
#if IEEE80211_VLAN_TAG_USED
dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
dev->vlan_rx_register = ath_vlan_register;
@@ -715,11 +709,9 @@
* 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);
ath_rate_dynamic_sysctl_register(sc);
ieee80211_sysctl_register(ic);
-#endif /* CONFIG_SYSCTL */
ieee80211_announce(ic);
ath_announce(sc);
return 0;
@@ -781,9 +773,7 @@
* returns because we'll get called back to reclaim node
* state and potentially want to use them.
*/
-#ifdef CONFIG_SYSCTL
ath_dynamic_sysctl_unregister(sc);
-#endif /* CONFIG_SYSCTL */
ath_rawdev_detach(sc);
unregister_netdev(dev);
@@ -5693,7 +5683,6 @@
return stats;
}
-#ifdef CONFIG_NET_WIRELESS
/*
* Return wireless extensions statistics.
*/
@@ -5915,7 +5904,6 @@
.num_private = N(ath_priv_handlers),
#undef N
};
-#endif /* CONFIG_NET_WIRELESS */
static int
ath_set_mac_address(struct net_device *dev, void *addr)
@@ -6120,7 +6108,6 @@
#undef IS_RUNNING
}
-#ifdef CONFIG_SYSCTL
/*
* Sysctls are split into ``static'' and ``dynamic'' tables.
* The former are defined at module load time and are used
@@ -6694,4 +6681,3 @@
if (ath_sysctl_header)
unregister_sysctl_table(ath_sysctl_header);
}
-#endif /* CONFIG_SYSCTL */
Modified: branches/madwifi-old-openhal/ath/if_ath_pci.c
===================================================================
--- branches/madwifi-old-openhal/ath/if_ath_pci.c 2007-01-22 03:07:30 UTC (rev 1988)
+++ branches/madwifi-old-openhal/ath/if_ath_pci.c 2007-01-22 03:07:57 UTC (rev 1989)
@@ -356,9 +356,7 @@
pci_unregister_driver(&ath_pci_drv_id);
return (-ENODEV);
}
-#ifdef CONFIG_SYSCTL
ath_sysctl_register();
-#endif
return (0);
}
module_init(init_ath_pci);
@@ -366,9 +364,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: branches/madwifi-old-openhal/ath/if_athrate.h
===================================================================
--- branches/madwifi-old-openhal/ath/if_athrate.h 2007-01-22 03:07:30 UTC (rev 1988)
+++ branches/madwifi-old-openhal/ath/if_athrate.h 2007-01-22 03:07:57 UTC (rev 1989)
@@ -84,14 +84,12 @@
struct ath_ratectrl *ath_rate_attach(struct ath_softc *);
void ath_rate_detach(struct ath_ratectrl *);
-#ifdef CONFIG_SYSCTL
/*
* Allow rate control module to register dynamic sysctls, after
* dev->name is filled in; Modules are expected to unregister dynamic
* sysctls in ath_rate_detach().
*/
void ath_rate_dynamic_sysctl_register(struct ath_softc *);
-#endif /* CONFIG_SYSCTL */
/*
* State storage handling.
Modified: branches/madwifi-old-openhal/ath/if_athvar.h
===================================================================
--- branches/madwifi-old-openhal/ath/if_athvar.h 2007-01-22 03:07:30 UTC (rev 1988)
+++ branches/madwifi-old-openhal/ath/if_athvar.h 2007-01-22 03:07:57 UTC (rev 1989)
@@ -47,9 +47,7 @@
#include "if_athioctl.h"
#include "if_athrate.h"
-#ifdef CONFIG_NET_WIRELESS
#include <linux/wireless.h>
-#endif
#ifndef ARPHRD_IEEE80211_RADIOTAP
#define ARPHRD_IEEE80211_RADIOTAP 803 /* IEEE 802.11 + radiotap header */
@@ -360,13 +358,9 @@
struct timer_list sc_cal_ch; /* calibration timer */
struct timer_list sc_scan_ch; /* AP scan timer */
-#ifdef CONFIG_NET_WIRELESS
struct iw_statistics sc_iwstats; /* wireless statistics block */
-#endif
-#ifdef CONFIG_SYSCTL
struct ctl_table_header *sc_sysctl_header;
struct ctl_table *sc_sysctls;
-#endif
};
#define ATH_LOCK_INIT(_sc) \
@@ -402,10 +396,8 @@
#else
irqreturn_t ath_intr(int, void *, struct pt_regs *regs);
#endif
-#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: branches/madwifi-old-openhal/ath_rate/amrr/amrr.c
===================================================================
--- branches/madwifi-old-openhal/ath_rate/amrr/amrr.c 2007-01-22 03:07:30 UTC (rev 1988)
+++ branches/madwifi-old-openhal/ath_rate/amrr/amrr.c 2007-01-22 03:07:57 UTC (rev 1989)
@@ -503,13 +503,11 @@
#define CTL_AUTO -2 /* cannot be CTL_ANY or CTL_NONE */
-#ifdef CONFIG_SYSCTL
void
ath_rate_dynamic_sysctl_register(struct ath_softc *sc)
{
}
EXPORT_SYMBOL(ath_rate_dynamic_sysctl_register);
-#endif /* CONFIG_SYSCTL */
/*
@@ -586,9 +584,7 @@
{
printk(KERN_INFO "%s: %s\n", dev_info, version);
-#ifdef CONFIG_SYSCTL
ath_sysctl_header = register_sysctl_table(ath_root_table, 1);
-#endif
return (0);
}
module_init(init_ath_rate_amrr);
@@ -596,10 +592,8 @@
static void __exit
exit_ath_rate_amrr(void)
{
-#ifdef CONFIG_SYSCTL
if (ath_sysctl_header != NULL)
unregister_sysctl_table(ath_sysctl_header);
-#endif
printk(KERN_INFO "%s: unloaded\n", dev_info);
}
Modified: branches/madwifi-old-openhal/ath_rate/onoe/onoe.c
===================================================================
--- branches/madwifi-old-openhal/ath_rate/onoe/onoe.c 2007-01-22 03:07:30 UTC (rev 1988)
+++ branches/madwifi-old-openhal/ath_rate/onoe/onoe.c 2007-01-22 03:07:57 UTC (rev 1989)
@@ -501,13 +501,11 @@
#define CTL_AUTO -2 /* cannot be CTL_ANY or CTL_NONE */
-#ifdef CONFIG_SYSCTL
void
ath_rate_dynamic_sysctl_register(struct ath_softc *sc)
{
}
EXPORT_SYMBOL(ath_rate_dynamic_sysctl_register);
-#endif /* CONFIG_SYSCTL */
/*
* Static (i.e. global) sysctls.
@@ -581,9 +579,7 @@
{
printk(KERN_INFO "%s: %s\n", dev_info, version);
-#ifdef CONFIG_SYSCTL
ath_sysctl_header = register_sysctl_table(ath_root_table, 1);
-#endif
return (0);
}
module_init(init_ath_rate_onoe);
@@ -591,10 +587,8 @@
static void __exit
exit_ath_rate_onoe(void)
{
-#ifdef CONFIG_SYSCTL
if (ath_sysctl_header != NULL)
unregister_sysctl_table(ath_sysctl_header);
-#endif
printk(KERN_INFO "%s: unloaded\n", dev_info);
}
Modified: branches/madwifi-old-openhal/ath_rate/sample/sample.c
===================================================================
--- branches/madwifi-old-openhal/ath_rate/sample/sample.c 2007-01-22 03:07:30 UTC (rev 1988)
+++ branches/madwifi-old-openhal/ath_rate/sample/sample.c 2007-01-22 03:07:57 UTC (rev 1989)
@@ -815,7 +815,6 @@
{
struct sample_softc *osc = (struct sample_softc *) arc;
-#if CONFIG_SYSCTL
if (osc->sysctl_header) {
unregister_sysctl_table(osc->sysctl_header);
osc->sysctl_header = NULL;
@@ -825,14 +824,10 @@
osc->sysctls = NULL;
}
-#endif /* CONFIG_SYSCTL */
-
kfree(osc);
}
EXPORT_SYMBOL(ath_rate_detach);
-#ifdef CONFIG_SYSCTL
-
int
read_rate_stats(struct ieee80211_node *ni, int size, char *buf, int space)
{
@@ -1019,7 +1014,6 @@
}
EXPORT_SYMBOL(ath_rate_dynamic_sysctl_register);
-#endif /* CONFIG_SYSCTL */
/*
* Static (i.e. global) sysctls.
@@ -1094,9 +1088,7 @@
{
printk(KERN_INFO "%s: %s\n", dev_info, version);
-#ifdef CONFIG_SYSCTL
ath_sysctl_header = register_sysctl_table(ath_root_table, 1);
-#endif
return (0);
}
module_init(init_ath_rate_sample);
@@ -1104,10 +1096,8 @@
static void __exit
exit_ath_rate_sample(void)
{
-#ifdef CONFIG_SYSCTL
if (ath_sysctl_header != NULL)
unregister_sysctl_table(ath_sysctl_header);
-#endif
printk(KERN_INFO "%s: unloaded\n", dev_info);
}
Modified: branches/madwifi-old-openhal/ath_rate/sample/sample.h
===================================================================
--- branches/madwifi-old-openhal/ath_rate/sample/sample.h 2007-01-22 03:07:30 UTC (rev 1988)
+++ branches/madwifi-old-openhal/ath_rate/sample/sample.h 2007-01-22 03:07:57 UTC (rev 1989)
@@ -47,10 +47,8 @@
int ath_smoothing_rate; /* ewma percentage (out of 100) */
int ath_sample_rate; /* send a different bit-rate 1/X packets */
-#ifdef CONFIG_SYSCTL
struct ctl_table_header *sysctl_header;
struct ctl_table *sysctls;
-#endif
};
#define ATH_SOFTC_SAMPLE(sc) ((struct sample_softc *)sc->sc_rc)
Modified: branches/madwifi-old-openhal/net80211/ieee80211.c
===================================================================
--- branches/madwifi-old-openhal/net80211/ieee80211.c 2007-01-22 03:07:30 UTC (rev 1988)
+++ branches/madwifi-old-openhal/net80211/ieee80211.c 2007-01-22 03:07:57 UTC (rev 1989)
@@ -221,9 +221,7 @@
ieee80211_crypto_detach(ic);
ieee80211_node_detach(ic);
ifmedia_removeall(&ic->ic_media);
-#ifdef CONFIG_SYSCTL
ieee80211_sysctl_unregister(ic);
-#endif
IEEE80211_BEACON_LOCK_DESTROY(ic);
_MOD_DEC_USE(THIS_MODULE);
}
Modified: branches/madwifi-old-openhal/net80211/ieee80211_linux.c
===================================================================
--- branches/madwifi-old-openhal/net80211/ieee80211_linux.c 2007-01-22 03:07:30 UTC (rev 1988)
+++ branches/madwifi-old-openhal/net80211/ieee80211_linux.c 2007-01-22 03:07:57 UTC (rev 1989)
@@ -279,7 +279,6 @@
}
EXPORT_SYMBOL(ieee80211_notify_michael_failure);
-#ifdef CONFIG_SYSCTL
#include <linux/ctype.h>
static int
@@ -519,7 +518,6 @@
}
}
EXPORT_SYMBOL(ieee80211_sysctl_unregister);
-#endif /* CONFIG_SYSCTL */
/*
* Format an Ethernet MAC for printing.
Modified: branches/madwifi-old-openhal/net80211/ieee80211_linux.h
===================================================================
--- branches/madwifi-old-openhal/net80211/ieee80211_linux.h 2007-01-22 03:07:30 UTC (rev 1988)
+++ branches/madwifi-old-openhal/net80211/ieee80211_linux.h 2007-01-22 03:07:57 UTC (rev 1989)
@@ -355,7 +355,6 @@
#error "Please fix asm/byteorder.h"
#endif
-#ifdef CONFIG_SYSCTL
/*
* Deal with the sysctl handler api changing.
*/
@@ -375,7 +374,6 @@
extern void ieee80211_sysctl_register(struct ieee80211com *);
extern void ieee80211_sysctl_unregister(struct ieee80211com *);
-#endif /* CONFIG_SYSCTL */
#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
#define IEEE80211_VLAN_TAG_USED 1
@@ -394,7 +392,6 @@
#define free_netdev(dev) kfree(dev)
#endif
-#ifdef CONFIG_NET_WIRELESS
struct iw_statistics;
extern void ieee80211_iw_getstats(struct ieee80211com*, struct iw_statistics*);
struct iw_request_info;
@@ -487,6 +484,5 @@
struct iw_request_info *, void *, char *);
extern void ieee80211_ioctl_iwsetup(struct iw_handler_def *);
-#endif
#endif /* _NET80211_IEEE80211_LINUX_H_ */
Modified: branches/madwifi-old-openhal/net80211/ieee80211_var.h
===================================================================
--- branches/madwifi-old-openhal/net80211/ieee80211_var.h 2007-01-22 03:07:30 UTC (rev 1988)
+++ branches/madwifi-old-openhal/net80211/ieee80211_var.h 2007-01-22 03:07:57 UTC (rev 1989)
@@ -89,11 +89,9 @@
u_int32_t ic_debug; /* debug msg flags */
u_int ic_vap; /* virtual AP index */
ieee80211_beacon_lock_t ic_beaconlock; /* beacon update lock */
-#ifdef CONFIG_SYSCTL
char ic_procname[12];/* e.g. wlan%d */
struct ctl_table_header *ic_sysctl_header;
struct ctl_table *ic_sysctls;
-#endif
struct vlan_group *ic_vlgrp; /* vlan group state */
int (*ic_init)(struct net_device *);
Modified: branches/madwifi-old-openhal/net80211/ieee80211_wireless.c
===================================================================
--- branches/madwifi-old-openhal/net80211/ieee80211_wireless.c 2007-01-22 03:07:30 UTC (rev 1988)
+++ branches/madwifi-old-openhal/net80211/ieee80211_wireless.c 2007-01-22 03:07:57 UTC (rev 1989)
@@ -39,7 +39,6 @@
#define EXPORT_SYMTAB
#endif
-#ifdef CONFIG_NET_WIRELESS
/*
* Wireless extensions support for 802.11 common code.
*/
@@ -2358,4 +2357,3 @@
return -EOPNOTSUPP;
}
EXPORT_SYMBOL(ieee80211_ioctlx);
-#endif /* CONFIG_NET_WIRELESS */
|