mirrors
/
madwifi
mirror of https://github.com/proski/madwifi
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't set ctl_name in Linux 2.6.33+, it was removed 

git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@4102 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
proski 2010-01-09 08:34:37 +00:00
parent 52147817c3
commit 4bbde45a51
6 changed files with 76 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
ath/if_ath.c
View File

@ -11177,173 +11177,173 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl, write, filp, buffer, lenp, ppos)
}
static const ctl_table ath_sysctl_template[] = {
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "distance",
.mode = 0644,
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_DISTANCE,
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "slottime",
.mode = 0644,
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_SLOTTIME,
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "acktimeout",
.mode = 0644,
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_ACKTIMEOUT,
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "ctstimeout",
.mode = 0644,
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_CTSTIMEOUT,
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "softled",
.mode = 0644,
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_SOFTLED,
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "ledpin",
.mode = 0644,
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_LEDPIN,
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "countrycode",
.mode = 0444,
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_COUNTRYCODE,
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "maxvaps",
.mode = 0444,
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_MAXVAPS,
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "regdomain",
.mode = 0444,
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_REGDOMAIN,
},
#ifdef AR_DEBUG
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "debug",
.mode = 0644,
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_DEBUG,
},
#endif
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "txantenna",
.mode = 0644,
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_TXANTENNA,
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "rxantenna",
.mode = 0644,
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_RXANTENNA,
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "diversity",
.mode = 0644,
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_DIVERSITY,
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "txintrperiod",
.mode = 0644,
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_TXINTRPERIOD,
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "fftxqmin",
.mode = 0644,
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_FFTXQMIN,
},
#ifdef ATH_SUPERG_XR
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "xrpollperiod",
.mode = 0644,
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_XR_POLL_PERIOD,
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "xrpollcount",
.mode = 0644,
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_XR_POLL_COUNT,
},
#endif
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "ackrate",
.mode = 0644,
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_ACKRATE,
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "rp",
.mode = 0200,
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_RP,
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "radar_print",
.mode = 0200,
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_RP_PRINT,
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "radar_print_all",
.mode = 0200,
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_RP_PRINT_ALL,
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "radar_dump",
.mode = 0200,
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_RP_PRINT_MEM,
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "radar_dump_all",
.mode = 0200,
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_RP_PRINT_MEM_ALL,
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "rp_flush",
.mode = 0200,
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_RP_FLUSH,
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "panic",
.mode = 0200,
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_PANIC,
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "rp_ignored",
.mode = 0644,
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_RP_IGNORED,
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "radar_ignored",
.mode = 0644,
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_RADAR_IGNORED,
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "intmit",
.mode = 0644,
.proc_handler = ath_sysctl_halparam,
@ -11386,12 +11386,12 @@ ath_dynamic_sysctl_register(struct ath_softc *sc)
strncpy(dev_name, DEV_NAME(sc->sc_dev), strlen(DEV_NAME(sc->sc_dev)) + 1);
/* setup the table */
sc->sc_sysctls[0].ctl_name = CTL_DEV;
ATH_SET_CTL_NAME(sc->sc_sysctls[0], CTL_DEV);
sc->sc_sysctls[0].procname = "dev";
sc->sc_sysctls[0].mode = 0555;
sc->sc_sysctls[0].child = &sc->sc_sysctls[2];
/* [1] is NULL terminator */
sc->sc_sysctls[2].ctl_name = CTL_AUTO;
ATH_SET_CTL_NAME(sc->sc_sysctls[2], CTL_AUTO);
sc->sc_sysctls[2].procname = dev_name;
sc->sc_sysctls[2].mode = 0555;
sc->sc_sysctls[2].child = &sc->sc_sysctls[4];
@ -11508,7 +11508,7 @@ ath_announce(struct net_device *dev)
*/
static ctl_table ath_static_sysctls[] = {
#ifdef AR_DEBUG
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "debug",
.mode = 0644,
.data = &ath_debug,
@ -11516,28 +11516,28 @@ static ctl_table ath_static_sysctls[] = {
.proc_handler = proc_dointvec
},
#endif
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "countrycode",
.mode = 0444,
.data = &ath_countrycode,
.maxlen = sizeof(ath_countrycode),
.proc_handler = proc_dointvec
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "maxvaps",
.mode = 0444,
.data = &ath_maxvaps,
.maxlen = sizeof(ath_maxvaps),
.proc_handler = proc_dointvec
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "outdoor",
.mode = 0444,
.data = &ath_outdoor,
.maxlen = sizeof(ath_outdoor),
.proc_handler = proc_dointvec
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "xchanmode",
.mode = 0444,
.data = &ath_xchanmode,
@ -11547,14 +11547,14 @@ static ctl_table ath_static_sysctls[] = {
{ 0 }
};
static ctl_table ath_ath_table[] = {
{ .ctl_name = DEV_ATH,
{ ATH_INIT_CTL_NAME(DEV_ATH)
.procname = "ath",
.mode = 0555,
.child = ath_static_sysctls
}, { 0 }
};
static ctl_table ath_root_table[] = {
{ .ctl_name = CTL_DEV,
{ ATH_INIT_CTL_NAME(CTL_DEV)
.procname = "dev",
.mode = 0555,
.child = ath_ath_table

20
ath_hal/ah_os.c
View File

@ -975,7 +975,7 @@ EXPORT_SYMBOL(ath_hal_memcmp);
static ctl_table ath_hal_sysctls[] = {
#ifdef AH_DEBUG
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "debug",
.mode = 0644,
.data = &ath_hal_debug,
@ -983,21 +983,21 @@ static ctl_table ath_hal_sysctls[] = {
.proc_handler = proc_dointvec
},
#endif /* AH_DEBUG */
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "dma_beacon_response_time",
.data = &ath_hal_dma_beacon_response_time,
.maxlen = sizeof(ath_hal_dma_beacon_response_time),
.mode = 0644,
.proc_handler = proc_dointvec
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "sw_beacon_response_time",
.mode = 0644,
.data = &ath_hal_sw_beacon_response_time,
.maxlen = sizeof(ath_hal_sw_beacon_response_time),
.proc_handler = proc_dointvec
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "swba_backoff",
.mode = 0644,
.data = &ath_hal_additional_swba_backoff,
@ -1005,19 +1005,19 @@ static ctl_table ath_hal_sysctls[] = {
.proc_handler = proc_dointvec
},
#ifdef AH_DEBUG_ALQ
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "alq",
.mode = 0644,
.proc_handler = sysctl_hw_ath_hal_log
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "alq_size",
.mode = 0644,
.data = &ath_hal_alq_qsize,
.maxlen = sizeof(ath_hal_alq_qsize),
.proc_handler = proc_dointvec
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "alq_lost",
.mode = 0644,
.data = &ath_hal_alq_lost,
@ -1028,21 +1028,21 @@ static ctl_table ath_hal_sysctls[] = {
{ 0 }
};
static ctl_table ath_hal_table[] = {
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "hal",
.mode = 0555,
.child = ath_hal_sysctls
}, { 0 }
};
static ctl_table ath_ath_table[] = {
{ .ctl_name = DEV_ATH,
{ ATH_INIT_CTL_NAME(DEV_ATH)
.procname = "ath",
.mode = 0555,
.child = ath_hal_table
}, { 0 }
};
static ctl_table ath_root_table[] = {
{ .ctl_name = CTL_DEV,
{ ATH_INIT_CTL_NAME(CTL_DEV)
.procname = "dev",
.mode = 0555,
.child = ath_ath_table

12
ath_rate/amrr/amrr.c
View File

@ -501,7 +501,7 @@ static int min_threshold = 1;
*/
static ctl_table ath_rate_static_sysctls[] = {
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "interval",
.mode = 0644,
.data = &ath_rateinterval,
@ -510,7 +510,7 @@ static ctl_table ath_rate_static_sysctls[] = {
.extra2 = &maxint,
.proc_handler = proc_dointvec_minmax
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "max_success_threshold",
.mode = 0644,
.data = &ath_rate_max_success_threshold,
@ -519,7 +519,7 @@ static ctl_table ath_rate_static_sysctls[] = {
.extra2 = &maxint,
.proc_handler = proc_dointvec_minmax
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "min_success_threshold",
.mode = 0644,
.data = &ath_rate_min_success_threshold,
@ -531,21 +531,21 @@ static ctl_table ath_rate_static_sysctls[] = {
{ 0 }
};
static ctl_table ath_rate_table[] = {
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "rate_amrr",
.mode = 0555,
.child = ath_rate_static_sysctls
}, { 0 }
};
static ctl_table ath_ath_table[] = {
{ .ctl_name = DEV_ATH,
{ ATH_INIT_CTL_NAME(DEV_ATH)
.procname = "ath",
.mode = 0555,
.child = ath_rate_table
}, { 0 }
};
static ctl_table ath_root_table[] = {
{ .ctl_name = CTL_DEV,
{ ATH_INIT_CTL_NAME(CTL_DEV)
.procname = "dev",
.mode = 0555,
.child = ath_ath_table

12
ath_rate/onoe/onoe.c
View File

@ -449,7 +449,7 @@ static int maxint = 0x7fffffff; /* 32-bit big */
* Static (i.e. global) sysctls.
*/
static ctl_table ath_rate_static_sysctls[] = {
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "interval",
.mode = 0644,
.data = &ath_rateinterval,
@ -458,7 +458,7 @@ static ctl_table ath_rate_static_sysctls[] = {
.extra2 = &maxint,
.proc_handler = proc_dointvec_minmax
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "raise",
.mode = 0644,
.data = &ath_rate_raise,
@ -467,7 +467,7 @@ static ctl_table ath_rate_static_sysctls[] = {
.extra2 = &maxpercent,
.proc_handler = proc_dointvec_minmax
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "raise_threshold",
.mode = 0644,
.data = &ath_rate_raise_threshold,
@ -477,21 +477,21 @@ static ctl_table ath_rate_static_sysctls[] = {
{ 0 }
};
static ctl_table ath_rate_table[] = {
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "rate_onoe",
.mode = 0555,
.child = ath_rate_static_sysctls
}, { 0 }
};
static ctl_table ath_ath_table[] = {
{ .ctl_name = DEV_ATH,
{ ATH_INIT_CTL_NAME(DEV_ATH)
.procname = "ath",
.mode = 0555,
.child = ath_rate_table
}, { 0 }
};
static ctl_table ath_root_table[] = {
{ .ctl_name = CTL_DEV,
{ ATH_INIT_CTL_NAME(CTL_DEV)
.procname = "dev",
.mode = 0555,
.child = ath_ath_table

8
include/compat.h
View File

@ -199,6 +199,14 @@ typedef unsigned long resource_size_t;
#define DEV_ATH CTL_UNNUMBERED
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
#define ATH_INIT_CTL_NAME(val)
#define ATH_SET_CTL_NAME(ctl, val)
#else
#define ATH_INIT_CTL_NAME(val) .ctl_name = val,
#define ATH_SET_CTL_NAME(ctl, val) ctl.ctl_name = val
#endif
/* __skb_append got a third parameter in 2.6.14 */
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
#define __skb_queue_after(_list, _old, _new) __skb_append(_old, _new)

18
net80211/ieee80211_linux.c
View File

@ -899,39 +899,39 @@ IEEE80211_SYSCTL_DECL(ieee80211_sysctl_monitor_crc_errors, ctl, write, filp, buf
static const ctl_table ieee80211_sysctl_template[] = {
#ifdef IEEE80211_DEBUG
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "debug",
.mode = 0644,
.proc_handler = ieee80211_sysctl_debug
},
#endif
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "dev_type",
.mode = 0644,
.proc_handler = ieee80211_sysctl_dev_type
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "monitor_nods_only",
.mode = 0644,
.proc_handler = ieee80211_sysctl_monitor_nods_only
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "monitor_txf_len",
.mode = 0644,
.proc_handler = ieee80211_sysctl_monitor_txf_len
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "monitor_phy_errors",
.mode = 0644,
.proc_handler = ieee80211_sysctl_monitor_phy_errors
},
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "monitor_crc_errors",
.mode = 0644,
.proc_handler = ieee80211_sysctl_monitor_crc_errors
},
/* NB: must be last entry before NULL */
{ .ctl_name = CTL_AUTO,
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "%parent",
.maxlen = IFNAMSIZ,
.mode = 0444,
@ -984,12 +984,12 @@ ieee80211_virtfs_latevattach(struct ieee80211vap *vap)
strncpy(devname, vap->iv_dev->name, strlen(vap->iv_dev->name) + 1);
/* setup the table */
vap->iv_sysctls[0].ctl_name = CTL_NET;
ATH_SET_CTL_NAME(vap->iv_sysctls[0], CTL_NET);
vap->iv_sysctls[0].procname = "net";
vap->iv_sysctls[0].mode = 0555;
vap->iv_sysctls[0].child = &vap->iv_sysctls[2];
/* [1] is NULL terminator */
vap->iv_sysctls[2].ctl_name = CTL_AUTO;
ATH_SET_CTL_NAME(vap->iv_sysctls[2], CTL_AUTO);
vap->iv_sysctls[2].procname = devname; /* XXX bad idea? */
vap->iv_sysctls[2].mode = 0555;
vap->iv_sysctls[2].child = &vap->iv_sysctls[4];