Please note: This project is no longer active. The website is kept online for historic purposes only.
If you´re looking for a Linux driver for your Atheros WLAN device, you should continue here .

Ticket #2367 (new defect)

Opened 12 years ago

Last modified 11 years ago

Build Error with v2.6.33-rc1 kernel and madwifi-hal-0.10.5.6-r4100-20090929

Reported by: mgavl69@juno.com Assigned to:
Priority: minor Milestone:
Component: madwifi: driver Version: trunk
Keywords: Cc:
Patch is attached: 0 Pending: 0

Description

Checking requirements... ok.
Checking kernel configuration... ok.
make -C /lib/modules/2.6.33-rc1-candela/build SUBDIRS=/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929 modules
make[1]: Entering directory `/usr/src/linux-headers-2.6.33-rc1-candela'
  CC [M]  /home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.o
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:10985: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:10985: error: 'CTL_UNNUMBERED' undeclared here (not in a function)
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:10991: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:10997: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11003: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11009: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11015: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11021: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11027: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11033: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11040: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11047: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11053: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11059: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11065: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11071: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11078: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11084: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11091: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11097: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11103: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11109: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11115: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11121: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11127: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11133: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11139: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11145: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11151: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c: In function 'ath_dynamic_sysctl_register':
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11194: error: 'struct ctl_table' has no member named 'ctl_name'
cc1: warnings being treated as errors
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11194: error: statement with no effect
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11199: error: 'struct ctl_table' has no member named 'ctl_name'
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11199: error: statement with no effect
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c: At top level:
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11316: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11316: error: initializer element is not constant
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11316: error: (near initialization for 'ath_static_sysctls[0].procname')
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11324: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11324: error: initializer element is not constant
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11324: error: (near initialization for 'ath_static_sysctls[1].procname')
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11331: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11331: error: initializer element is not constant
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11331: error: (near initialization for 'ath_static_sysctls[2].procname')
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11338: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11338: error: initializer element is not constant
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11338: error: (near initialization for 'ath_static_sysctls[3].procname')
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11345: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11345: error: initializer element is not constant
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11345: error: (near initialization for 'ath_static_sysctls[4].procname')
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11355: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11355: error: initializer element is not constant
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11355: error: (near initialization for 'ath_ath_table[0].procname')
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11362: error: unknown field 'ctl_name' specified in initializer
/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.c:11362: error: initialization makes pointer from integer without a cast
make[3]: *** [/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath/if_ath.o] Error 1
make[2]: *** [/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929/ath] Error 2
make[1]: *** [_module_/home/foo/Documents/madwifi-hal-0.10.5.6-r4100-20090929] Error 2
make[1]: Leaving directory `/usr/src/linux-headers-2.6.33-rc1-candela'
make: *** [modules] Error 2

Attachments

remove_ctl_name.diff (14.8 kB) - added by anonymous on 01/04/10 20:41:42.

Change History

01/04/10 20:41:04 changed by zarren2@hotmail.co.uk

ctl_name is no longer included in linux-2.6.33*

Index: net80211/ieee80211_linux.c =================================================================== --- net80211/ieee80211_linux.c (revision 4100) +++ net80211/ieee80211_linux.c (working copy) @@ -899,40 +899,33 @@

static const ctl_table ieee80211_sysctl_template[] = { #ifdef IEEE80211_DEBUG

- { .ctl_name = CTL_AUTO, - .procname = "debug", + { .procname = "debug",

.mode = 0644, .proc_handler = ieee80211_sysctl_debug

},

#endif

- { .ctl_name = CTL_AUTO, - .procname = "dev_type", + { .procname = "dev_type",

.mode = 0644, .proc_handler = ieee80211_sysctl_dev_type

},

- { .ctl_name = CTL_AUTO, - .procname = "monitor_nods_only", + { .procname = "monitor_nods_only",

.mode = 0644, .proc_handler = ieee80211_sysctl_monitor_nods_only

},

- { .ctl_name = CTL_AUTO, - .procname = "monitor_txf_len", + { .procname = "monitor_txf_len",

.mode = 0644, .proc_handler = ieee80211_sysctl_monitor_txf_len

},

- { .ctl_name = CTL_AUTO, - .procname = "monitor_phy_errors", + { .procname = "monitor_phy_errors",

.mode = 0644, .proc_handler = ieee80211_sysctl_monitor_phy_errors

},

- { .ctl_name = CTL_AUTO, - .procname = "monitor_crc_errors", + { .procname = "monitor_crc_errors",

.mode = 0644, .proc_handler = ieee80211_sysctl_monitor_crc_errors

}, /* NB: must be last entry before NULL */

- { .ctl_name = CTL_AUTO, - .procname = "%parent", + { .procname = "%parent",

.maxlen = IFNAMSIZ, .mode = 0444, .proc_handler = proc_dostring

@@ -983,13 +976,11 @@

} strncpy(devname, vap->iv_dev->name, strlen(vap->iv_dev->name) + 1);

- /* setup the table */ - vap->iv_sysctls[0].ctl_name = CTL_NET; + /* setup the table */;

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;

vap->iv_sysctls[2].procname = devname; /* XXX bad idea? */ vap->iv_sysctls[2].mode = 0555; vap->iv_sysctls[2].child = &vap->iv_sysctls[4];

Index: ath_rate/onoe/onoe.c =================================================================== --- ath_rate/onoe/onoe.c (revision 4100) +++ ath_rate/onoe/onoe.c (working copy) @@ -449,8 +449,7 @@

  • Static (i.e. global) sysctls. */

static ctl_table ath_rate_static_sysctls[] = {

- { .ctl_name = CTL_AUTO, - .procname = "interval", + { .procname = "interval",

.mode = 0644, .data = &ath_rateinterval, .maxlen = sizeof(ath_rateinterval),

@@ -458,8 +457,7 @@

.extra2 = &maxint, .proc_handler = proc_dointvec_minmax

},

- { .ctl_name = CTL_AUTO, - .procname = "raise", + { .procname = "raise",

.mode = 0644, .data = &ath_rate_raise, .maxlen = sizeof(ath_rate_raise),

@@ -467,8 +465,7 @@

.extra2 = &maxpercent, .proc_handler = proc_dointvec_minmax

},

- { .ctl_name = CTL_AUTO, - .procname = "raise_threshold", + { .procname = "raise_threshold",

.mode = 0644, .data = &ath_rate_raise_threshold, .maxlen = sizeof(ath_rate_raise_threshold),

@@ -477,22 +474,19 @@

{ 0 }

}; static ctl_table ath_rate_table[] = {

- { .ctl_name = CTL_AUTO, - .procname = "rate_onoe", + { .procname = "rate_onoe",

.mode = 0555, .child = ath_rate_static_sysctls

}, { 0 }

}; static ctl_table ath_ath_table[] = {

- { .ctl_name = DEV_ATH, - .procname = "ath", + { .procname = "ath",

.mode = 0555, .child = ath_rate_table

}, { 0 }

}; static ctl_table ath_root_table[] = {

- { .ctl_name = CTL_DEV, - .procname = "dev", + { .procname = "dev",

.mode = 0555, .child = ath_ath_table

}, { 0 }

Index: ath_rate/amrr/amrr.c =================================================================== --- ath_rate/amrr/amrr.c (revision 4100) +++ ath_rate/amrr/amrr.c (working copy) @@ -501,8 +501,7 @@

*/

static ctl_table ath_rate_static_sysctls[] = {

- { .ctl_name = CTL_AUTO, - .procname = "interval", + { .procname = "interval",

.mode = 0644, .data = &ath_rateinterval, .maxlen = sizeof(ath_rateinterval),

@@ -510,8 +509,7 @@

.extra2 = &maxint, .proc_handler = proc_dointvec_minmax

},

- { .ctl_name = CTL_AUTO, - .procname = "max_success_threshold", + { .procname = "max_success_threshold",

.mode = 0644, .data = &ath_rate_max_success_threshold, .maxlen = sizeof(ath_rate_max_success_threshold),

@@ -519,8 +517,7 @@

.extra2 = &maxint, .proc_handler = proc_dointvec_minmax

},

- { .ctl_name = CTL_AUTO, - .procname = "min_success_threshold", + { .procname = "min_success_threshold",

.mode = 0644, .data = &ath_rate_min_success_threshold, .maxlen = sizeof(ath_rate_min_success_threshold),

@@ -531,22 +528,19 @@

{ 0 }

}; static ctl_table ath_rate_table[] = {

- { .ctl_name = CTL_AUTO, - .procname = "rate_amrr", + { .procname = "rate_amrr",

.mode = 0555, .child = ath_rate_static_sysctls

}, { 0 }

}; static ctl_table ath_ath_table[] = {

- { .ctl_name = DEV_ATH, - .procname = "ath", + { .procname = "ath",

.mode = 0555, .child = ath_rate_table

}, { 0 }

}; static ctl_table ath_root_table[] = {

- { .ctl_name = CTL_DEV, - .procname = "dev", + { .procname = "dev",

.mode = 0555, .child = ath_ath_table

}, { 0 }

Index: ath_hal/ah_os.c =================================================================== --- ath_hal/ah_os.c (revision 4100) +++ ath_hal/ah_os.c (working copy) @@ -975,50 +975,43 @@

static ctl_table ath_hal_sysctls[] = { #ifdef AH_DEBUG

- { .ctl_name = CTL_AUTO, - .procname = "debug", + { .procname = "debug",

.mode = 0644, .data = &ath_hal_debug, .maxlen = sizeof(ath_hal_debug), .proc_handler = proc_dointvec

},

#endif /* AH_DEBUG */

- { .ctl_name = CTL_AUTO, - .procname = "dma_beacon_response_time", + { .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, - .procname = "sw_beacon_response_time", + { .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, - .procname = "swba_backoff", + { .procname = "swba_backoff",

.mode = 0644, .data = &ath_hal_additional_swba_backoff, .maxlen = sizeof(ath_hal_additional_swba_backoff), .proc_handler = proc_dointvec

},

#ifdef AH_DEBUG_ALQ

- { .ctl_name = CTL_AUTO, - .procname = "alq", + { .procname = "alq",

.mode = 0644, .proc_handler = sysctl_hw_ath_hal_log

},

- { .ctl_name = CTL_AUTO, - .procname = "alq_size", + { .procname = "alq_size",

.mode = 0644, .data = &ath_hal_alq_qsize, .maxlen = sizeof(ath_hal_alq_qsize), .proc_handler = proc_dointvec

},

- { .ctl_name = CTL_AUTO, - .procname = "alq_lost", + { .procname = "alq_lost",

.mode = 0644, .data = &ath_hal_alq_lost, .maxlen = sizeof(ath_hal_alq_lost),

@@ -1028,22 +1021,19 @@

{ 0 }

}; static ctl_table ath_hal_table[] = {

- { .ctl_name = CTL_AUTO, - .procname = "hal", + { .procname = "hal",

.mode = 0555, .child = ath_hal_sysctls

}, { 0 }

}; static ctl_table ath_ath_table[] = {

- { .ctl_name = DEV_ATH, - .procname = "ath", + { .procname = "ath",

.mode = 0555, .child = ath_hal_table

}, { 0 }

}; static ctl_table ath_root_table[] = {

- { .ctl_name = CTL_DEV, - .procname = "dev", + { .procname = "dev",

.mode = 0555, .child = ath_ath_table

}, { 0 }

Index: ath/if_ath.c =================================================================== --- ath/if_ath.c (revision 4100) +++ ath/if_ath.c (working copy) @@ -11177,174 +11177,146 @@

}

static const ctl_table ath_sysctl_template[] = {

- { .ctl_name = CTL_AUTO, - .procname = "distance", + { .procname = "distance",

.mode = 0644, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_DISTANCE,

},

- { .ctl_name = CTL_AUTO, - .procname = "slottime", + { .procname = "slottime",

.mode = 0644, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_SLOTTIME,

},

- { .ctl_name = CTL_AUTO, - .procname = "acktimeout", + { .procname = "acktimeout",

.mode = 0644, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_ACKTIMEOUT,

},

- { .ctl_name = CTL_AUTO, - .procname = "ctstimeout", + { .procname = "ctstimeout",

.mode = 0644, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_CTSTIMEOUT,

},

- { .ctl_name = CTL_AUTO, - .procname = "softled", + { .procname = "softled",

.mode = 0644, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_SOFTLED,

},

- { .ctl_name = CTL_AUTO, - .procname = "ledpin", + { .procname = "ledpin",

.mode = 0644, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_LEDPIN,

},

- { .ctl_name = CTL_AUTO, - .procname = "countrycode", + { .procname = "countrycode",

.mode = 0444, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_COUNTRYCODE,

},

- { .ctl_name = CTL_AUTO, - .procname = "maxvaps", + { .procname = "maxvaps",

.mode = 0444, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_MAXVAPS,

},

- { .ctl_name = CTL_AUTO, - .procname = "regdomain", + { .procname = "regdomain",

.mode = 0444, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_REGDOMAIN,

},

#ifdef AR_DEBUG

- { .ctl_name = CTL_AUTO, - .procname = "debug", + { .procname = "debug",

.mode = 0644, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_DEBUG,

},

#endif

- { .ctl_name = CTL_AUTO, - .procname = "txantenna", + { .procname = "txantenna",

.mode = 0644, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_TXANTENNA,

},

- { .ctl_name = CTL_AUTO, - .procname = "rxantenna", + { .procname = "rxantenna",

.mode = 0644, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_RXANTENNA,

},

- { .ctl_name = CTL_AUTO, - .procname = "diversity", + { .procname = "diversity",

.mode = 0644, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_DIVERSITY,

},

- { .ctl_name = CTL_AUTO, - .procname = "txintrperiod", + { .procname = "txintrperiod",

.mode = 0644, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_TXINTRPERIOD,

},

- { .ctl_name = CTL_AUTO, - .procname = "fftxqmin", + { .procname = "fftxqmin",

.mode = 0644, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_FFTXQMIN,

},

#ifdef ATH_SUPERG_XR

- { .ctl_name = CTL_AUTO, - .procname = "xrpollperiod", + { .procname = "xrpollperiod",

.mode = 0644, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_XR_POLL_PERIOD,

},

- { .ctl_name = CTL_AUTO, - .procname = "xrpollcount", + { .procname = "xrpollcount",

.mode = 0644, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_XR_POLL_COUNT,

},

#endif

- { .ctl_name = CTL_AUTO, - .procname = "ackrate", + { .procname = "ackrate",

.mode = 0644, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_ACKRATE,

},

- { .ctl_name = CTL_AUTO, - .procname = "rp", + { .procname = "rp",

.mode = 0200, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_RP,

},

- { .ctl_name = CTL_AUTO, - .procname = "radar_print", + { .procname = "radar_print",

.mode = 0200, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_RP_PRINT,

},

- { .ctl_name = CTL_AUTO, - .procname = "radar_print_all", + { .procname = "radar_print_all",

.mode = 0200, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_RP_PRINT_ALL,

},

- { .ctl_name = CTL_AUTO, - .procname = "radar_dump", + { .procname = "radar_dump",

.mode = 0200, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_RP_PRINT_MEM,

},

- { .ctl_name = CTL_AUTO, - .procname = "radar_dump_all", + { .procname = "radar_dump_all",

.mode = 0200, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_RP_PRINT_MEM_ALL,

},

- { .ctl_name = CTL_AUTO, - .procname = "rp_flush", + { .procname = "rp_flush",

.mode = 0200, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_RP_FLUSH,

},

- { .ctl_name = CTL_AUTO, - .procname = "panic", + { .procname = "panic",

.mode = 0200, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_PANIC,

},

- { .ctl_name = CTL_AUTO, - .procname = "rp_ignored", + { .procname = "rp_ignored",

.mode = 0644, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_RP_IGNORED,

},

- { .ctl_name = CTL_AUTO, - .procname = "radar_ignored", + { .procname = "radar_ignored",

.mode = 0644, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_RADAR_IGNORED,

},

- { .ctl_name = CTL_AUTO, - .procname = "intmit", + { .procname = "intmit",

.mode = 0644, .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_INTMIT,

@@ -11386,12 +11358,10 @@

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;

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;

sc->sc_sysctls[2].procname = dev_name; sc->sc_sysctls[2].mode = 0555; sc->sc_sysctls[2].child = &sc->sc_sysctls[4];

@@ -11508,37 +11478,32 @@

*/

static ctl_table ath_static_sysctls[] = { #ifdef AR_DEBUG

- { .ctl_name = CTL_AUTO, - .procname = "debug", + { .procname = "debug",

.mode = 0644, .data = &ath_debug, .maxlen = sizeof(ath_debug), .proc_handler = proc_dointvec

},

#endif

- { .ctl_name = CTL_AUTO, - .procname = "countrycode", + { .procname = "countrycode",

.mode = 0444, .data = &ath_countrycode, .maxlen = sizeof(ath_countrycode), .proc_handler = proc_dointvec

},

- { .ctl_name = CTL_AUTO, - .procname = "maxvaps", + { .procname = "maxvaps",

.mode = 0444, .data = &ath_maxvaps, .maxlen = sizeof(ath_maxvaps), .proc_handler = proc_dointvec

},

- { .ctl_name = CTL_AUTO, - .procname = "outdoor", + { .procname = "outdoor",

.mode = 0444, .data = &ath_outdoor, .maxlen = sizeof(ath_outdoor), .proc_handler = proc_dointvec

},

- { .ctl_name = CTL_AUTO, - .procname = "xchanmode", + { .procname = "xchanmode",

.mode = 0444, .data = &ath_xchanmode, .maxlen = sizeof(ath_xchanmode),

@@ -11547,15 +11512,13 @@

{ 0 }

}; static ctl_table ath_ath_table[] = {

- { .ctl_name = DEV_ATH, - .procname = "ath", + { .procname = "ath",

.mode = 0555, .child = ath_static_sysctls

}, { 0 }

}; static ctl_table ath_root_table[] = {

- { .ctl_name = CTL_DEV, - .procname = "dev", + { .procname = "dev",

.mode = 0555, .child = ath_ath_table

}, { 0 }

01/04/10 20:41:42 changed by anonymous

  • attachment remove_ctl_name.diff added.