net/madwifi/patches/479-linux-3.8-compat.patch

   1 --- a/ath/if_ath_pci.c
   2 +++ b/ath/if_ath_pci.c
   3 @@ -94,7 +94,7 @@ static char *dev_info = "ath_pci";
   4   * "new way" to do things, we may want to switch back to having
   5   * the HAL check them by defining a probe method.
   6   */
   7 -static struct pci_device_id ath_pci_id_table[] __devinitdata = {
   8 +static struct pci_device_id ath_pci_id_table[] = {
   9         { 0x168c, 0x0007, PCI_ANY_ID, PCI_ANY_ID },
  10         { 0x168c, 0x0012, PCI_ANY_ID, PCI_ANY_ID },
  11         { 0x168c, 0x0013, PCI_ANY_ID, PCI_ANY_ID },
  12 --- a/ath/if_ath.c
  13 +++ b/ath/if_ath.c
  14 @@ -11615,228 +11615,190 @@ static int mincalibrate = 1;                /* once a
  15  static int maxint = 0x7fffffff;                /* 32-bit big */
  16
  17  static const ctl_table ath_sysctl_template[] = {
  18 -       { .ctl_name     = CTL_AUTO,
  19 -         .procname     = "dev_vendor",
  20 +       { .procname     = "dev_vendor",
  21           .mode         = 0644,
  22           .proc_handler = ath_sysctl_hwinfo,
  23 -         .strategy   = &sysctl_string,
  24           .data         = "N/A",
  25           .maxlen   = 1,
  26           .extra2       = (void *)ATH_CARD_VENDOR,
  27         },
  28 -       { .ctl_name     = CTL_AUTO,
  29 -         .procname     = "dev_name",
  30 +       { .procname     = "dev_name",
  31           .mode         = 0644,
  32           .proc_handler = ath_sysctl_hwinfo,
  33 -         .strategy   = &sysctl_string,
  34           .data         = "N/A",
  35           .maxlen   = 1,
  36           .extra2       = (void *)ATH_CARD_NAME,
  37         },
  38 -       { .ctl_name     = CTL_AUTO,
  39 -         .procname     = "slottime",
  40 +       { .procname     = "slottime",
  41           .mode         = 0644,
  42           .proc_handler = ath_sysctl_halparam,
  43           .extra2       = (void *)ATH_SLOTTIME,
  44         },
  45 -       { .ctl_name     = CTL_AUTO,
  46 -         .procname     = "acktimeout",
  47 +       { .procname     = "acktimeout",
  48           .mode         = 0644,
  49           .proc_handler = ath_sysctl_halparam,
  50           .extra2       = (void *)ATH_ACKTIMEOUT,
  51         },
  52 -       { .ctl_name     = CTL_AUTO,
  53 -         .procname     = "ctstimeout",
  54 +       { .procname     = "ctstimeout",
  55           .mode         = 0644,
  56           .proc_handler = ath_sysctl_halparam,
  57           .extra2       = (void *)ATH_CTSTIMEOUT,
  58         },
  59 -       { .ctl_name     = CTL_AUTO,
  60 -         .procname     = "distance",
  61 +       { .procname     = "distance",
  62           .mode         = 0644,
  63           .proc_handler = ath_sysctl_halparam,
  64           .extra2       = (void *)ATH_DISTANCE,
  65         },
  66 -       { .ctl_name     = CTL_AUTO,
  67 -         .procname     = "silent",
  68 +       { .procname     = "silent",
  69           .mode         = 0644,
  70           .proc_handler = ath_sysctl_halparam,
  71           .extra2       = (void *)ATH_SILENT,
  72         },
  73 -       { .ctl_name     = CTL_AUTO,
  74 -         .procname     = "softled",
  75 +       { .procname     = "softled",
  76           .mode         = 0644,
  77           .proc_handler = ath_sysctl_halparam,
  78           .extra2       = (void *)ATH_SOFTLED,
  79         },
  80 -       { .ctl_name     = CTL_AUTO,
  81 -         .procname     = "ledpin",
  82 +       { .procname     = "ledpin",
  83           .mode         = 0644,
  84           .proc_handler = ath_sysctl_halparam,
  85           .extra2       = (void *)ATH_LEDPIN,
  86         },
  87 -       { .ctl_name     = CTL_AUTO,
  88 -         .procname     = "countrycode",
  89 +       { .procname     = "countrycode",
  90           .mode         = 0644,
  91           .proc_handler = ath_sysctl_halparam,
  92           .extra2       = (void *)ATH_COUNTRYCODE,
  93         },
  94 -       { .ctl_name     = CTL_AUTO,
  95 -         .procname     = "outdoor",
  96 +       { .procname     = "outdoor",
  97           .mode         = 0644,
  98           .proc_handler = ath_sysctl_halparam,
  99           .extra2       = (void *)ATH_OUTDOOR,
 100         },
 101 -       { .ctl_name     = CTL_AUTO,
 102 -         .procname     = "regdomain",
 103 +       { .procname     = "regdomain",
 104           .mode         = 0644,
 105           .proc_handler = ath_sysctl_halparam,
 106           .extra2       = (void *)ATH_REGDOMAIN,
 107         },
 108  #ifdef AR_DEBUG
 109 -       { .ctl_name     = CTL_AUTO,
 110 -         .procname     = "debug",
 111 +       { .procname     = "debug",
 112           .mode         = 0644,
 113           .proc_handler = ath_sysctl_halparam,
 114           .extra2       = (void *)ATH_DEBUG,
 115         },
 116  #endif
 117 -       { .ctl_name     = CTL_AUTO,
 118 -         .procname     = "poweroffset",
 119 +       { .procname     = "poweroffset",
 120           .mode         = 0644,
 121           .proc_handler = ath_sysctl_halparam,
 122           .extra2       = (void *)ATH_POWEROFFSET,
 123         },
 124 -       { .ctl_name     = CTL_AUTO,
 125 -         .procname     = "txantenna",
 126 +       { .procname     = "txantenna",
 127           .mode         = 0644,
 128           .proc_handler = ath_sysctl_halparam,
 129           .extra2       = (void *)ATH_TXANTENNA,
 130         },
 131 -       { .ctl_name     = CTL_AUTO,
 132 -         .procname     = "rxantenna",
 133 +       { .procname     = "rxantenna",
 134           .mode         = 0644,
 135           .proc_handler = ath_sysctl_halparam,
 136           .extra2       = (void *)ATH_RXANTENNA,
 137         },
 138 -       { .ctl_name     = CTL_AUTO,
 139 -         .procname     = "diversity",
 140 +       { .procname     = "diversity",
 141           .mode         = 0644,
 142           .proc_handler = ath_sysctl_halparam,
 143           .extra2       = (void *)ATH_DIVERSITY,
 144         },
 145 -       { .ctl_name     = CTL_AUTO,
 146 -         .procname     = "txintrperiod",
 147 +       { .procname     = "txintrperiod",
 148           .mode         = 0644,
 149           .proc_handler = ath_sysctl_halparam,
 150           .extra2       = (void *)ATH_TXINTRPERIOD,
 151         },
 152 -       { .ctl_name     = CTL_AUTO,
 153 -         .procname     = "fftxqmin",
 154 +       { .procname     = "fftxqmin",
 155           .mode         = 0644,
 156           .proc_handler = ath_sysctl_halparam,
 157           .extra2       = (void *)ATH_FFTXQMIN,
 158         },
 159  #ifdef ATH_SUPERG_XR
 160 -       { .ctl_name     = CTL_AUTO,
 161 -         .procname     = "xrpollperiod",
 162 +       { .procname     = "xrpollperiod",
 163           .mode         = 0644,
 164           .proc_handler = ath_sysctl_halparam,
 165           .extra2       = (void *)ATH_XR_POLL_PERIOD,
 166         },
 167 -       { .ctl_name     = CTL_AUTO,
 168 -         .procname     = "xrpollcount",
 169 +       { .procname     = "xrpollcount",
 170           .mode         = 0644,
 171           .proc_handler = ath_sysctl_halparam,
 172           .extra2       = (void *)ATH_XR_POLL_COUNT,
 173         },
 174  #endif
 175 -       { .ctl_name     = CTL_AUTO,
 176 -         .procname     = "ackrate",
 177 +       { .procname     = "ackrate",
 178           .mode         = 0644,
 179           .proc_handler = ath_sysctl_halparam,
 180           .extra2       = (void *)ATH_ACKRATE,
 181         },
 182 -       { .ctl_name     = CTL_AUTO,
 183 -         .procname     = "channelbw",
 184 +       { .procname     = "channelbw",
 185           .mode         = 0644,
 186           .proc_handler = ath_sysctl_halparam,
 187           .extra2       = (void *)ATH_CHANBW,
 188         },
 189 -       { .ctl_name     = CTL_AUTO,
 190 -         .procname     = "rp",
 191 +       { .procname     = "rp",
 192           .mode         = 0200,
 193           .proc_handler = ath_sysctl_halparam,
 194           .extra2       = (void *)ATH_RP,
 195         },
 196 -       { .ctl_name     = CTL_AUTO,
 197 -         .procname     = "radar_print",
 198 +       { .procname     = "radar_print",
 199           .mode         = 0200,
 200           .proc_handler = ath_sysctl_halparam,
 201           .extra2       = (void *)ATH_RP_PRINT,
 202         },
 203 -       { .ctl_name     = CTL_AUTO,
 204 -         .procname     = "radar_print_all",
 205 +       { .procname     = "radar_print_all",
 206           .mode         = 0200,
 207           .proc_handler = ath_sysctl_halparam,
 208           .extra2       = (void *)ATH_RP_PRINT_ALL,
 209         },
 210 -       { .ctl_name     = CTL_AUTO,
 211 -         .procname     = "radar_dump",
 212 +       { .procname     = "radar_dump",
 213           .mode         = 0200,
 214           .proc_handler = ath_sysctl_halparam,
 215           .extra2       = (void *)ATH_RP_PRINT_MEM,
 216         },
 217 -       { .ctl_name     = CTL_AUTO,
 218 -         .procname     = "radar_dump_all",
 219 +       { .procname     = "radar_dump_all",
 220           .mode         = 0200,
 221           .proc_handler = ath_sysctl_halparam,
 222           .extra2       = (void *)ATH_RP_PRINT_MEM_ALL,
 223         },
 224 -       { .ctl_name     = CTL_AUTO,
 225 -         .procname     = "rp_flush",
 226 +       { .procname     = "rp_flush",
 227           .mode         = 0200,
 228           .proc_handler = ath_sysctl_halparam,
 229           .extra2       = (void *)ATH_RP_FLUSH,
 230         },
 231 -       { .ctl_name     = CTL_AUTO,
 232 -         .procname     = "panic",
 233 +       { .procname     = "panic",
 234           .mode         = 0200,
 235           .proc_handler = ath_sysctl_halparam,
 236           .extra2       = (void *)ATH_PANIC,
 237         },
 238 -       { .ctl_name     = CTL_AUTO,
 239 -         .procname     = "rp_ignored",
 240 +       { .procname     = "rp_ignored",
 241           .mode         = 0644,
 242           .proc_handler = ath_sysctl_halparam,
 243           .extra2       = (void *)ATH_RP_IGNORED,
 244         },
 245 -       { .ctl_name     = CTL_AUTO,
 246 -         .procname     = "radar_ignored",
 247 +       { .procname     = "radar_ignored",
 248           .mode         = 0644,
 249           .proc_handler = ath_sysctl_halparam,
 250           .extra2       = (void *)ATH_RADAR_IGNORED,
 251         },
 252 -       { .ctl_name     = CTL_AUTO,
 253 -         .procname     = "intmit",
 254 +       { .procname     = "intmit",
 255           .mode         = 0644,
 256           .proc_handler = ath_sysctl_halparam,
 257           .extra2       = (void *)ATH_INTMIT,
 258         },
 259 -       { .ctl_name     = CTL_AUTO,
 260 -         .procname     = "noise_immunity",
 261 +       { .procname     = "noise_immunity",
 262           .mode         = 0644,
 263           .proc_handler = ath_sysctl_halparam,
 264           .extra2       = (void *)ATH_NOISE_IMMUNITY,
 265         },
 266 -       { .ctl_name     = CTL_AUTO,
 267 -         .procname     = "ofdm_weak_det",
 268 +       { .procname     = "ofdm_weak_det",
 269           .mode         = 0644,
 270           .proc_handler = ath_sysctl_halparam,
 271           .extra2       = (void *)ATH_OFDM_WEAK_DET,
 272         },
 273 -       { .ctl_name     = CTL_AUTO,
 274 -         .procname     = "cca_thresh",
 275 +       { .procname     = "cca_thresh",
 276           .mode         = 0644,
 277           .proc_handler = ath_sysctl_halparam,
 278           .extra2       = (void *)ATH_CCA_THRESH,
 279 @@ -11873,12 +11835,10 @@ ath_dynamic_sysctl_register(struct ath_s
 280
 281         /* setup the table */
 282         memset(sc->sc_sysctls, 0, space);
 283 -       sc->sc_sysctls[0].ctl_name = CTL_DEV;
 284         sc->sc_sysctls[0].procname = "dev";
 285         sc->sc_sysctls[0].mode = 0555;
 286         sc->sc_sysctls[0].child = &sc->sc_sysctls[2];
 287         /* [1] is NULL terminator */
 288 -       sc->sc_sysctls[2].ctl_name = CTL_AUTO;
 289         sc->sc_sysctls[2].procname = dev_name;
 290         sc->sc_sysctls[2].mode = 0555;
 291         sc->sc_sysctls[2].child = &sc->sc_sysctls[4];
 292 @@ -12001,23 +11961,20 @@ ath_announce(struct net_device *dev)
 293   */
 294  static ctl_table ath_static_sysctls[] = {
 295  #ifdef AR_DEBUG
 296 -       { .ctl_name     = CTL_AUTO,
 297 -         .procname     = "debug",
 298 +       { .procname     = "debug",
 299           .mode         = 0644,
 300           .data         = &ath_debug,
 301           .maxlen       = sizeof(ath_debug),
 302           .proc_handler = proc_dointvec
 303         },
 304  #endif
 305 -       { .ctl_name     = CTL_AUTO,
 306 -         .procname     = "xchanmode",
 307 +       { .procname     = "xchanmode",
 308           .mode         = 0444,
 309           .data         = &ath_xchanmode,
 310           .maxlen       = sizeof(ath_xchanmode),
 311           .proc_handler = proc_dointvec
 312         },
 313 -       { .ctl_name     = CTL_AUTO,
 314 -         .procname     = "calibrate",
 315 +       { .procname     = "calibrate",
 316           .mode         = 0644,
 317           .data         = &ath_calinterval,
 318           .maxlen       = sizeof(ath_calinterval),
 319 @@ -12028,15 +11985,13 @@ static ctl_table ath_static_sysctls[] =
 320         { 0 }
 321  };
 322  static ctl_table ath_ath_table[] = {
 323 -       { .ctl_name     = DEV_ATH,
 324 -         .procname     = "ath",
 325 +       { .procname     = "ath",
 326           .mode         = 0555,
 327           .child        = ath_static_sysctls
 328         }, { 0 }
 329  };
 330  static ctl_table ath_root_table[] = {
 331 -       { .ctl_name     = CTL_DEV,
 332 -         .procname     = "dev",
 333 +       { .procname     = "dev",
 334           .mode         = 0555,
 335           .child        = ath_ath_table
 336         }, { 0 }
 337 --- a/net80211/ieee80211_linux.c
 338 +++ b/net80211/ieee80211_linux.c
 339 @@ -699,40 +699,33 @@ IEEE80211_SYSCTL_DECL(ieee80211_sysctl_m
 340
 341  static const ctl_table ieee80211_sysctl_template[] = {
 342  #ifdef IEEE80211_DEBUG
 343 -       { .ctl_name     = CTL_AUTO,
 344 -         .procname     = "debug",
 345 +       { .procname     = "debug",
 346           .mode         = 0644,
 347           .proc_handler = ieee80211_sysctl_debug
 348         },
 349  #endif
 350 -       { .ctl_name     = CTL_AUTO,
 351 -         .procname     = "dev_type",
 352 +       { .procname     = "dev_type",
 353           .mode         = 0644,
 354           .proc_handler = ieee80211_sysctl_dev_type
 355         },
 356 -       { .ctl_name     = CTL_AUTO,
 357 -         .procname     = "monitor_nods_only",
 358 +       { .procname     = "monitor_nods_only",
 359           .mode         = 0644,
 360           .proc_handler = ieee80211_sysctl_monitor_nods_only
 361         },
 362 -       { .ctl_name     = CTL_AUTO,
 363 -         .procname     = "monitor_txf_len",
 364 +       { .procname     = "monitor_txf_len",
 365           .mode         = 0644,
 366           .proc_handler = ieee80211_sysctl_monitor_txf_len
 367         },
 368 -       { .ctl_name     = CTL_AUTO,
 369 -         .procname     = "monitor_phy_errors",
 370 +       { .procname     = "monitor_phy_errors",
 371           .mode         = 0644,
 372           .proc_handler = ieee80211_sysctl_monitor_phy_errors
 373         },
 374 -       { .ctl_name     = CTL_AUTO,
 375 -         .procname     = "monitor_crc_errors",
 376 +       { .procname     = "monitor_crc_errors",
 377           .mode         = 0644,
 378           .proc_handler = ieee80211_sysctl_monitor_crc_errors
 379         },
 380         /* NB: must be last entry before NULL */
 381 -       { .ctl_name     = CTL_AUTO,
 382 -         .procname     = "%parent",
 383 +       { .procname     = "%parent",
 384           .maxlen       = IFNAMSIZ,
 385           .mode         = 0444,
 386           .proc_handler = proc_dostring
 387 @@ -786,12 +779,10 @@ ieee80211_virtfs_latevattach(struct ieee
 388
 389         /* setup the table */
 390         memset(vap->iv_sysctls, 0, space);
 391 -       vap->iv_sysctls[0].ctl_name = CTL_NET;
 392         vap->iv_sysctls[0].procname = "net";
 393         vap->iv_sysctls[0].mode = 0555;
 394         vap->iv_sysctls[0].child = &vap->iv_sysctls[2];
 395         /* [1] is NULL terminator */
 396 -       vap->iv_sysctls[2].ctl_name = CTL_AUTO;
 397         vap->iv_sysctls[2].procname = devname; /* XXX bad idea? */
 398         vap->iv_sysctls[2].mode = 0555;
 399         vap->iv_sysctls[2].child = &vap->iv_sysctls[4];
 400 --- a/ath_hal/ah_os.c
 401 +++ b/ath_hal/ah_os.c
 402 @@ -518,50 +518,43 @@ EXPORT_SYMBOL(ath_hal_memcmp);
 403
 404  static ctl_table ath_hal_sysctls[] = {
 405  #ifdef AH_DEBUG
 406 -       { .ctl_name     = CTL_AUTO,
 407 -         .procname     = "debug",
 408 +       { .procname     = "debug",
 409           .mode         = 0644,
 410           .data         = &ath_hal_debug,
 411           .maxlen       = sizeof(ath_hal_debug),
 412           .proc_handler = proc_dointvec
 413         },
 414  #endif
 415 -       { .ctl_name     = CTL_AUTO,
 416 -         .procname     = "dma_beacon_response_time",
 417 +       { .procname     = "dma_beacon_response_time",
 418           .data         = &ath_hal_dma_beacon_response_time,
 419           .maxlen       = sizeof(ath_hal_dma_beacon_response_time),
 420           .mode         = 0644,
 421           .proc_handler = proc_dointvec
 422         },
 423 -       { .ctl_name     = CTL_AUTO,
 424 -         .procname     = "sw_beacon_response_time",
 425 +       { .procname     = "sw_beacon_response_time",
 426           .mode         = 0644,
 427           .data         = &ath_hal_sw_beacon_response_time,
 428           .maxlen       = sizeof(ath_hal_sw_beacon_response_time),
 429           .proc_handler = proc_dointvec
 430         },
 431 -       { .ctl_name     = CTL_AUTO,
 432 -         .procname     = "swba_backoff",
 433 +       { .procname     = "swba_backoff",
 434           .mode         = 0644,
 435           .data         = &ath_hal_additional_swba_backoff,
 436           .maxlen       = sizeof(ath_hal_additional_swba_backoff),
 437           .proc_handler = proc_dointvec
 438         },
 439  #ifdef AH_DEBUG_ALQ
 440 -       { .ctl_name     = CTL_AUTO,
 441 -         .procname     = "alq",
 442 +       { .procname     = "alq",
 443           .mode         = 0644,
 444           .proc_handler = sysctl_hw_ath_hal_log
 445         },
 446 -       { .ctl_name     = CTL_AUTO,
 447 -         .procname     = "alq_size",
 448 +       { .procname     = "alq_size",
 449           .mode         = 0644,
 450           .data         = &ath_hal_alq_qsize,
 451           .maxlen       = sizeof(ath_hal_alq_qsize),
 452           .proc_handler = proc_dointvec
 453         },
 454 -       { .ctl_name     = CTL_AUTO,
 455 -         .procname     = "alq_lost",
 456 +       { .procname     = "alq_lost",
 457           .mode         = 0644,
 458           .data         = &ath_hal_alq_lost,
 459           .maxlen       = sizeof(ath_hal_alq_lost),
 460 @@ -571,22 +564,19 @@ static ctl_table ath_hal_sysctls[] = {
 461         { 0 }
 462  };
 463  static ctl_table ath_hal_table[] = {
 464 -       { .ctl_name     = CTL_AUTO,
 465 -         .procname     = "hal",
 466 +       { .procname     = "hal",
 467           .mode         = 0555,
 468           .child        = ath_hal_sysctls
 469         }, { 0 }
 470  };
 471  static ctl_table ath_ath_table[] = {
 472 -       { .ctl_name     = DEV_ATH,
 473 -         .procname     = "ath",
 474 +       { .procname     = "ath",
 475           .mode         = 0555,
 476           .child        = ath_hal_table
 477         }, { 0 }
 478  };
 479  static ctl_table ath_root_table[] = {
 480 -       { .ctl_name     = CTL_DEV,
 481 -         .procname     = "dev",
 482 +       { .procname     = "dev",
 483           .mode         = 0555,
 484           .child        = ath_ath_table
 485         }, { 0 }
 486 --- a/ath_rate/amrr/amrr.c
 487 +++ b/ath_rate/amrr/amrr.c
 488 @@ -482,8 +482,7 @@ static int min_threshold = 1;
 489   */
 490
 491  static ctl_table ath_rate_static_sysctls[] = {
 492 -       { .ctl_name     = CTL_AUTO,
 493 -         .procname     = "interval",
 494 +       { .procname     = "interval",
 495           .mode         = 0644,
 496           .data         = &ath_rateinterval,
 497           .maxlen       = sizeof(ath_rateinterval),
 498 @@ -491,8 +490,7 @@ static ctl_table ath_rate_static_sysctls
 499           .extra2       = &maxint,
 500           .proc_handler = proc_dointvec_minmax
 501         },
 502 -       { .ctl_name     = CTL_AUTO,
 503 -         .procname     = "max_success_threshold",
 504 +       { .procname     = "max_success_threshold",
 505           .mode         = 0644,
 506           .data         = &ath_rate_max_success_threshold,
 507           .maxlen       = sizeof(ath_rate_max_success_threshold),
 508 @@ -500,8 +498,7 @@ static ctl_table ath_rate_static_sysctls
 509           .extra2       = &maxint,
 510           .proc_handler = proc_dointvec_minmax
 511         },
 512 -       { .ctl_name     = CTL_AUTO,
 513 -         .procname     = "min_success_threshold",
 514 +       { .procname     = "min_success_threshold",
 515           .mode         = 0644,
 516           .data         = &ath_rate_min_success_threshold,
 517           .maxlen       = sizeof(ath_rate_min_success_threshold),
 518 @@ -512,22 +509,19 @@ static ctl_table ath_rate_static_sysctls
 519         { 0 }
 520  };
 521  static ctl_table ath_rate_table[] = {
 522 -       { .ctl_name     = CTL_AUTO,
 523 -         .procname     = "rate",
 524 +       { .procname     = "rate",
 525           .mode         = 0555,
 526           .child        = ath_rate_static_sysctls
 527         }, { 0 }
 528  };
 529  static ctl_table ath_ath_table[] = {
 530 -       { .ctl_name     = DEV_ATH,
 531 -         .procname     = "ath",
 532 +       { .procname     = "ath",
 533           .mode         = 0555,
 534           .child        = ath_rate_table
 535         }, { 0 }
 536  };
 537  static ctl_table ath_root_table[] = {
 538 -       { .ctl_name     = CTL_DEV,
 539 -         .procname     = "dev",
 540 +       { .procname     = "dev",
 541           .mode         = 0555,
 542           .child        = ath_ath_table
 543         }, { 0 }
 544 --- a/ath_rate/onoe/onoe.c
 545 +++ b/ath_rate/onoe/onoe.c
 546 @@ -427,8 +427,7 @@ static int maxint = 0x7fffffff;             /* 32-b
 547   * Static (i.e. global) sysctls.
 548   */
 549  static ctl_table ath_rate_static_sysctls[] = {
 550 -       { .ctl_name     = CTL_AUTO,
 551 -         .procname     = "interval",
 552 +       { .procname     = "interval",
 553           .mode         = 0644,
 554           .data         = &ath_rateinterval,
 555           .maxlen       = sizeof(ath_rateinterval),
 556 @@ -436,8 +435,7 @@ static ctl_table ath_rate_static_sysctls
 557           .extra2       = &maxint,
 558           .proc_handler = proc_dointvec_minmax
 559         },
 560 -       { .ctl_name     = CTL_AUTO,
 561 -         .procname     = "raise",
 562 +       { .procname     = "raise",
 563           .mode         = 0644,
 564           .data         = &ath_rate_raise,
 565           .maxlen       = sizeof(ath_rate_raise),
 566 @@ -445,8 +443,7 @@ static ctl_table ath_rate_static_sysctls
 567           .extra2       = &maxpercent,
 568           .proc_handler = proc_dointvec_minmax
 569         },
 570 -       { .ctl_name     = CTL_AUTO,
 571 -         .procname     = "raise_threshold",
 572 +       { .procname     = "raise_threshold",
 573           .mode         = 0644,
 574           .data         = &ath_rate_raise_threshold,
 575           .maxlen       = sizeof(ath_rate_raise_threshold),
 576 @@ -455,22 +452,19 @@ static ctl_table ath_rate_static_sysctls
 577         { 0 }
 578  };
 579  static ctl_table ath_rate_table[] = {
 580 -       { .ctl_name     = CTL_AUTO,
 581 -         .procname     = "rate",
 582 +       { .procname     = "rate",
 583           .mode         = 0555,
 584           .child        = ath_rate_static_sysctls
 585         }, { 0 }
 586  };
 587  static ctl_table ath_ath_table[] = {
 588 -       { .ctl_name     = DEV_ATH,
 589 -         .procname     = "ath",
 590 +       { .procname     = "ath",
 591           .mode         = 0555,
 592           .child        = ath_rate_table
 593         }, { 0 }
 594  };
 595  static ctl_table ath_root_table[] = {
 596 -       { .ctl_name     = CTL_DEV,
 597 -         .procname     = "dev",
 598 +       { .procname     = "dev",
 599           .mode         = 0555,
 600           .child        = ath_ath_table
 601         }, { 0 }