diff options
author | Prashant P. Shah <pshah.mumbai@gmail.com> | 2010-05-09 13:11:46 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 18:29:43 -0400 |
commit | ce7f6389790f24e07e7e32518c798451e799a830 (patch) | |
tree | f0a366a9d3e08c448d19aad47d800a72448f3cb0 /drivers/staging/wlags49_h2 | |
parent | d101b958cb334c757edd4998fa0f2454755d7c3e (diff) |
Staging: wlags49_h2: fixed unnecessary braces issues in wl_profile.c
This is a patch to the wl_profile.c file that fixes the unnecessary braces
style issues found by the checkpatch.pl tool.
Signed-off-by: Prashant P. Shah <pshah.mumbai@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wlags49_h2')
-rw-r--r-- | drivers/staging/wlags49_h2/wl_profile.c | 228 |
1 files changed, 90 insertions, 138 deletions
diff --git a/drivers/staging/wlags49_h2/wl_profile.c b/drivers/staging/wlags49_h2/wl_profile.c index e4e78a4ace1..13ade703573 100644 --- a/drivers/staging/wlags49_h2/wl_profile.c +++ b/drivers/staging/wlags49_h2/wl_profile.c | |||
@@ -189,9 +189,8 @@ void parse_config(struct net_device *dev) | |||
189 | DBG_TRACE(DbgInfo, "Wireless config file found. Parsing options...\n"); | 189 | DBG_TRACE(DbgInfo, "Wireless config file found. Parsing options...\n"); |
190 | 190 | ||
191 | /* Read out the options */ | 191 | /* Read out the options */ |
192 | while (readline(file_desc, buffer)) { | 192 | while (readline(file_desc, buffer)) |
193 | translate_option(buffer, wvlan_config); | 193 | translate_option(buffer, wvlan_config); |
194 | } | ||
195 | /* Close the file */ | 194 | /* Close the file */ |
196 | close(file_desc); //;?even if file_desc == -1 ??? | 195 | close(file_desc); //;?even if file_desc == -1 ??? |
197 | } else { | 196 | } else { |
@@ -259,9 +258,8 @@ void parse_config(struct net_device *dev) | |||
259 | } else if (rc > 0) { | 258 | } else if (rc > 0) { |
260 | DBG_TRACE(DbgInfo, "read O.K.: %d bytes %.12s\n", rc, cp); | 259 | DBG_TRACE(DbgInfo, "read O.K.: %d bytes %.12s\n", rc, cp); |
261 | rc = read(file_desc, &cp[rc], 1); | 260 | rc = read(file_desc, &cp[rc], 1); |
262 | if (rc == 0) { | 261 | if (rc == 0) |
263 | DBG_TRACE(DbgInfo, "no more to read\n"); | 262 | DBG_TRACE(DbgInfo, "no more to read\n"); |
264 | } | ||
265 | } | 263 | } |
266 | if (rc != 0) { | 264 | if (rc != 0) { |
267 | DBG_ERROR(DbgInfo, "file not read in one swoop or other error"\ | 265 | DBG_ERROR(DbgInfo, "file not read in one swoop or other error"\ |
@@ -320,11 +318,10 @@ int readline(int filedesc, char *buffer) | |||
320 | } | 318 | } |
321 | 319 | ||
322 | /* Return the number of bytes read */ | 320 | /* Return the number of bytes read */ |
323 | if (result == -1) { | 321 | if (result == -1) |
324 | return result; | 322 | return result; |
325 | } else { | 323 | else |
326 | return bytes_read; | 324 | return bytes_read; |
327 | } | ||
328 | } // readline | 325 | } // readline |
329 | /*============================================================================*/ | 326 | /*============================================================================*/ |
330 | 327 | ||
@@ -366,9 +363,8 @@ void translate_option(char *buffer, struct wl_private *lp) | |||
366 | 363 | ||
367 | ParseConfigLine(buffer, &key, &value); | 364 | ParseConfigLine(buffer, &key, &value); |
368 | 365 | ||
369 | if (key == NULL || value == NULL) { | 366 | if (key == NULL || value == NULL) |
370 | return; | 367 | return; |
371 | } | ||
372 | 368 | ||
373 | /* Determine which key it is and perform the appropriate action */ | 369 | /* Determine which key it is and perform the appropriate action */ |
374 | 370 | ||
@@ -394,29 +390,26 @@ void translate_option(char *buffer, struct wl_private *lp) | |||
394 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_AUTH_KEY_MGMT_SUITE, value); | 390 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_AUTH_KEY_MGMT_SUITE, value); |
395 | 391 | ||
396 | value_convert = simple_strtoul(value, NULL, 0); | 392 | value_convert = simple_strtoul(value, NULL, 0); |
397 | if ((value_convert >= PARM_MIN_AUTH_KEY_MGMT_SUITE) || (value_convert <= PARM_MAX_AUTH_KEY_MGMT_SUITE)) { | 393 | if ((value_convert >= PARM_MIN_AUTH_KEY_MGMT_SUITE) || (value_convert <= PARM_MAX_AUTH_KEY_MGMT_SUITE)) |
398 | lp->AuthKeyMgmtSuite = value_convert; | 394 | lp->AuthKeyMgmtSuite = value_convert; |
399 | } else { | 395 | else |
400 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_AUTH_KEY_MGMT_SUITE); | 396 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_AUTH_KEY_MGMT_SUITE); |
401 | } | ||
402 | } else if (strcmp(key, PARM_NAME_BRSC_2GHZ) == 0) { | 397 | } else if (strcmp(key, PARM_NAME_BRSC_2GHZ) == 0) { |
403 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_BRSC_2GHZ, value); | 398 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_BRSC_2GHZ, value); |
404 | 399 | ||
405 | value_convert = simple_strtoul(value, NULL, 0); | 400 | value_convert = simple_strtoul(value, NULL, 0); |
406 | if ((value_convert >= PARM_MIN_BRSC) || (value_convert <= PARM_MAX_BRSC)) { | 401 | if ((value_convert >= PARM_MIN_BRSC) || (value_convert <= PARM_MAX_BRSC)) |
407 | lp->brsc[0] = value_convert; | 402 | lp->brsc[0] = value_convert; |
408 | } else { | 403 | else |
409 | DBG_WARNING(DbgInfo, "%s invaid; will be ignored\n", PARM_NAME_BRSC_2GHZ); | 404 | DBG_WARNING(DbgInfo, "%s invaid; will be ignored\n", PARM_NAME_BRSC_2GHZ); |
410 | } | ||
411 | } else if (strcmp(key, PARM_NAME_BRSC_5GHZ) == 0) { | 405 | } else if (strcmp(key, PARM_NAME_BRSC_5GHZ) == 0) { |
412 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_BRSC_5GHZ, value); | 406 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_BRSC_5GHZ, value); |
413 | 407 | ||
414 | value_convert = simple_strtoul(value, NULL, 0); | 408 | value_convert = simple_strtoul(value, NULL, 0); |
415 | if ((value_convert >= PARM_MIN_BRSC) || (value_convert <= PARM_MAX_BRSC)) { | 409 | if ((value_convert >= PARM_MIN_BRSC) || (value_convert <= PARM_MAX_BRSC)) |
416 | lp->brsc[1] = value_convert; | 410 | lp->brsc[1] = value_convert; |
417 | } else { | 411 | else |
418 | DBG_WARNING(DbgInfo, "%s invaid; will be ignored\n", PARM_NAME_BRSC_5GHZ); | 412 | DBG_WARNING(DbgInfo, "%s invaid; will be ignored\n", PARM_NAME_BRSC_5GHZ); |
419 | } | ||
420 | } else if ((strcmp(key, PARM_NAME_DESIRED_SSID) == 0) || (strcmp(key, PARM_NAME_OWN_SSID) == 0)) { | 413 | } else if ((strcmp(key, PARM_NAME_DESIRED_SSID) == 0) || (strcmp(key, PARM_NAME_OWN_SSID) == 0)) { |
421 | DBG_TRACE(DbgInfo, "SSID, value: %s\n", value); | 414 | DBG_TRACE(DbgInfo, "SSID, value: %s\n", value); |
422 | 415 | ||
@@ -437,22 +430,20 @@ void translate_option(char *buffer, struct wl_private *lp) | |||
437 | memset(lp->fw_image_filename, 0, (MAX_LINE_SIZE + 1)); | 430 | memset(lp->fw_image_filename, 0, (MAX_LINE_SIZE + 1)); |
438 | /* Make sure the value isn't too long */ | 431 | /* Make sure the value isn't too long */ |
439 | string_length = strlen(value); | 432 | string_length = strlen(value); |
440 | if (string_length > MAX_LINE_SIZE) { | 433 | if (string_length > MAX_LINE_SIZE) |
441 | DBG_WARNING(DbgInfo, "F/W image file name too long; will be ignored\n"); | 434 | DBG_WARNING(DbgInfo, "F/W image file name too long; will be ignored\n"); |
442 | } else { | 435 | else |
443 | memcpy(lp->fw_image_filename, value, string_length); | 436 | memcpy(lp->fw_image_filename, value, string_length); |
444 | } | ||
445 | } | 437 | } |
446 | #endif | 438 | #endif |
447 | else if (strcmp(key, PARM_NAME_ENABLE_ENCRYPTION) == 0) { | 439 | else if (strcmp(key, PARM_NAME_ENABLE_ENCRYPTION) == 0) { |
448 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_ENABLE_ENCRYPTION, value); | 440 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_ENABLE_ENCRYPTION, value); |
449 | 441 | ||
450 | value_convert = simple_strtoul(value, NULL, 0); | 442 | value_convert = simple_strtoul(value, NULL, 0); |
451 | if ((value_convert >= PARM_MIN_ENABLE_ENCRYPTION) && (value_convert <= PARM_MAX_ENABLE_ENCRYPTION)) { | 443 | if ((value_convert >= PARM_MIN_ENABLE_ENCRYPTION) && (value_convert <= PARM_MAX_ENABLE_ENCRYPTION)) |
452 | lp->EnableEncryption = value_convert; | 444 | lp->EnableEncryption = value_convert; |
453 | } else { | 445 | else |
454 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_ENABLE_ENCRYPTION); | 446 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_ENABLE_ENCRYPTION); |
455 | } | ||
456 | } else if (strcmp(key, PARM_NAME_ENCRYPTION) == 0) { | 447 | } else if (strcmp(key, PARM_NAME_ENCRYPTION) == 0) { |
457 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_ENCRYPTION, value); | 448 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_ENCRYPTION, value); |
458 | 449 | ||
@@ -522,19 +513,17 @@ void translate_option(char *buffer, struct wl_private *lp) | |||
522 | 513 | ||
523 | value_convert = simple_strtoul(value, NULL, 0); | 514 | value_convert = simple_strtoul(value, NULL, 0); |
524 | 515 | ||
525 | if ((value_convert >= PARM_MIN_MULTICAST_RATE) && (value_convert <= PARM_MAX_MULTICAST_RATE)) { | 516 | if ((value_convert >= PARM_MIN_MULTICAST_RATE) && (value_convert <= PARM_MAX_MULTICAST_RATE)) |
526 | lp->MulticastRate[0] = value_convert; | 517 | lp->MulticastRate[0] = value_convert; |
527 | } else { | 518 | else |
528 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_MULTICAST_RATE); | 519 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_MULTICAST_RATE); |
529 | } | ||
530 | } else if (strcmp(key, PARM_NAME_OWN_CHANNEL) == 0) { | 520 | } else if (strcmp(key, PARM_NAME_OWN_CHANNEL) == 0) { |
531 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_OWN_CHANNEL, value); | 521 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_OWN_CHANNEL, value); |
532 | 522 | ||
533 | value_convert = simple_strtoul(value, NULL, 0); | 523 | value_convert = simple_strtoul(value, NULL, 0); |
534 | if (wl_is_a_valid_chan(value_convert)) { | 524 | if (wl_is_a_valid_chan(value_convert)) { |
535 | if (value_convert > 14) { | 525 | if (value_convert > 14) |
536 | value_convert = value_convert | 0x100; | 526 | value_convert = value_convert | 0x100; |
537 | } | ||
538 | lp->Channel = value_convert; | 527 | lp->Channel = value_convert; |
539 | } else { | 528 | } else { |
540 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_OWN_CHANNEL); | 529 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_OWN_CHANNEL); |
@@ -556,65 +545,58 @@ void translate_option(char *buffer, struct wl_private *lp) | |||
556 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_RTS_THRESHOLD, value); | 545 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_RTS_THRESHOLD, value); |
557 | 546 | ||
558 | value_convert = simple_strtoul(value, NULL, 0); | 547 | value_convert = simple_strtoul(value, NULL, 0); |
559 | if ((value_convert >= PARM_MIN_RTS_THRESHOLD) && (value_convert <= PARM_MAX_RTS_THRESHOLD)) { | 548 | if ((value_convert >= PARM_MIN_RTS_THRESHOLD) && (value_convert <= PARM_MAX_RTS_THRESHOLD)) |
560 | lp->RTSThreshold = value_convert; | 549 | lp->RTSThreshold = value_convert; |
561 | } else { | 550 | else |
562 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_RTS_THRESHOLD); | 551 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_RTS_THRESHOLD); |
563 | } | ||
564 | } else if (strcmp(key, PARM_NAME_SRSC_2GHZ) == 0) { | 552 | } else if (strcmp(key, PARM_NAME_SRSC_2GHZ) == 0) { |
565 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_SRSC_2GHZ, value); | 553 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_SRSC_2GHZ, value); |
566 | 554 | ||
567 | value_convert = simple_strtoul(value, NULL, 0); | 555 | value_convert = simple_strtoul(value, NULL, 0); |
568 | if ((value_convert >= PARM_MIN_SRSC) || (value_convert <= PARM_MAX_SRSC)) { | 556 | if ((value_convert >= PARM_MIN_SRSC) || (value_convert <= PARM_MAX_SRSC)) |
569 | lp->srsc[0] = value_convert; | 557 | lp->srsc[0] = value_convert; |
570 | } else { | 558 | else |
571 | DBG_WARNING(DbgInfo, "%s invaid; will be ignored\n", PARM_NAME_SRSC_2GHZ); | 559 | DBG_WARNING(DbgInfo, "%s invaid; will be ignored\n", PARM_NAME_SRSC_2GHZ); |
572 | } | ||
573 | } else if (strcmp(key, PARM_NAME_SRSC_5GHZ) == 0) { | 560 | } else if (strcmp(key, PARM_NAME_SRSC_5GHZ) == 0) { |
574 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_SRSC_5GHZ, value); | 561 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_SRSC_5GHZ, value); |
575 | 562 | ||
576 | value_convert = simple_strtoul(value, NULL, 0); | 563 | value_convert = simple_strtoul(value, NULL, 0); |
577 | if ((value_convert >= PARM_MIN_SRSC) || (value_convert <= PARM_MAX_SRSC)) { | 564 | if ((value_convert >= PARM_MIN_SRSC) || (value_convert <= PARM_MAX_SRSC)) |
578 | lp->srsc[1] = value_convert; | 565 | lp->srsc[1] = value_convert; |
579 | } else { | 566 | else |
580 | DBG_WARNING(DbgInfo, "%s invaid; will be ignored\n", PARM_NAME_SRSC_5GHZ); | 567 | DBG_WARNING(DbgInfo, "%s invaid; will be ignored\n", PARM_NAME_SRSC_5GHZ); |
581 | } | ||
582 | } else if (strcmp(key, PARM_NAME_SYSTEM_SCALE) == 0) { | 568 | } else if (strcmp(key, PARM_NAME_SYSTEM_SCALE) == 0) { |
583 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_SYSTEM_SCALE, value); | 569 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_SYSTEM_SCALE, value); |
584 | 570 | ||
585 | value_convert = simple_strtoul(value, NULL, 0); | 571 | value_convert = simple_strtoul(value, NULL, 0); |
586 | if ((value_convert >= PARM_MIN_SYSTEM_SCALE) && (value_convert <= PARM_MAX_SYSTEM_SCALE)) { | 572 | if ((value_convert >= PARM_MIN_SYSTEM_SCALE) && (value_convert <= PARM_MAX_SYSTEM_SCALE)) |
587 | lp->DistanceBetweenAPs = value_convert; | 573 | lp->DistanceBetweenAPs = value_convert; |
588 | } else { | 574 | else |
589 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_SYSTEM_SCALE); | 575 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_SYSTEM_SCALE); |
590 | } | ||
591 | } else if (strcmp(key, PARM_NAME_TX_KEY) == 0) { | 576 | } else if (strcmp(key, PARM_NAME_TX_KEY) == 0) { |
592 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_TX_KEY, value); | 577 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_TX_KEY, value); |
593 | 578 | ||
594 | value_convert = simple_strtoul(value, NULL, 0); | 579 | value_convert = simple_strtoul(value, NULL, 0); |
595 | if ((value_convert >= PARM_MIN_TX_KEY) && (value_convert <= PARM_MAX_TX_KEY)) { | 580 | if ((value_convert >= PARM_MIN_TX_KEY) && (value_convert <= PARM_MAX_TX_KEY)) |
596 | lp->TransmitKeyID = simple_strtoul(value, NULL, 0); | 581 | lp->TransmitKeyID = simple_strtoul(value, NULL, 0); |
597 | } else { | 582 | else |
598 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_TX_KEY); | 583 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_TX_KEY); |
599 | } | ||
600 | } else if (strcmp(key, PARM_NAME_TX_RATE) == 0) { | 584 | } else if (strcmp(key, PARM_NAME_TX_RATE) == 0) { |
601 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_TX_RATE, value); | 585 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_TX_RATE, value); |
602 | 586 | ||
603 | value_convert = simple_strtoul(value, NULL, 0); | 587 | value_convert = simple_strtoul(value, NULL, 0); |
604 | if ((value_convert >= PARM_MIN_TX_RATE) && (value_convert <= PARM_MAX_TX_RATE)) { | 588 | if ((value_convert >= PARM_MIN_TX_RATE) && (value_convert <= PARM_MAX_TX_RATE)) |
605 | lp->TxRateControl[0] = value_convert; | 589 | lp->TxRateControl[0] = value_convert; |
606 | } else { | 590 | else |
607 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_TX_RATE); | 591 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_TX_RATE); |
608 | } | ||
609 | } else if (strcmp(key, PARM_NAME_TX_POW_LEVEL) == 0) { | 592 | } else if (strcmp(key, PARM_NAME_TX_POW_LEVEL) == 0) { |
610 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_TX_POW_LEVEL, value); | 593 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_TX_POW_LEVEL, value); |
611 | 594 | ||
612 | value_convert = simple_strtoul(value, NULL, 0); | 595 | value_convert = simple_strtoul(value, NULL, 0); |
613 | if ((value_convert >= PARM_MIN_TX_POW_LEVEL) || (value_convert <= PARM_MAX_TX_POW_LEVEL)) { | 596 | if ((value_convert >= PARM_MIN_TX_POW_LEVEL) || (value_convert <= PARM_MAX_TX_POW_LEVEL)) |
614 | lp->txPowLevel = value_convert; | 597 | lp->txPowLevel = value_convert; |
615 | } else { | 598 | else |
616 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_TX_POW_LEVEL); | 599 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_TX_POW_LEVEL); |
617 | } | ||
618 | } | 600 | } |
619 | 601 | ||
620 | /* Need to add? : Country code, Short/Long retry */ | 602 | /* Need to add? : Country code, Short/Long retry */ |
@@ -628,11 +610,10 @@ void translate_option(char *buffer, struct wl_private *lp) | |||
628 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_PORT_TYPE, value); | 610 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_PORT_TYPE, value); |
629 | 611 | ||
630 | value_convert = simple_strtoul(value, NULL, 0); | 612 | value_convert = simple_strtoul(value, NULL, 0); |
631 | if ((value_convert == PARM_MIN_PORT_TYPE) || (value_convert == PARM_MAX_PORT_TYPE)) { | 613 | if ((value_convert == PARM_MIN_PORT_TYPE) || (value_convert == PARM_MAX_PORT_TYPE)) |
632 | lp->PortType = value_convert; | 614 | lp->PortType = value_convert; |
633 | } else { | 615 | else |
634 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_PORT_TYPE); | 616 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_PORT_TYPE); |
635 | } | ||
636 | } else if (strcmp(key, PARM_NAME_PM_ENABLED) == 0) { | 617 | } else if (strcmp(key, PARM_NAME_PM_ENABLED) == 0) { |
637 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_PM_ENABLED, value); | 618 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_PM_ENABLED, value); |
638 | value_convert = simple_strtoul(value, NULL, 0); | 619 | value_convert = simple_strtoul(value, NULL, 0); |
@@ -656,46 +637,41 @@ void translate_option(char *buffer, struct wl_private *lp) | |||
656 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_MAX_SLEEP, value); | 637 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_MAX_SLEEP, value); |
657 | 638 | ||
658 | value_convert = simple_strtoul(value, NULL, 0); | 639 | value_convert = simple_strtoul(value, NULL, 0); |
659 | if ((value_convert >= 0) && (value_convert <= 65535)) { | 640 | if ((value_convert >= 0) && (value_convert <= 65535)) |
660 | lp->MaxSleepDuration = value_convert; | 641 | lp->MaxSleepDuration = value_convert; |
661 | } else { | 642 | else |
662 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_MAX_SLEEP); | 643 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_MAX_SLEEP); |
663 | } | ||
664 | } else if (strcmp(key, PARM_NAME_NETWORK_ADDR) == 0) { | 644 | } else if (strcmp(key, PARM_NAME_NETWORK_ADDR) == 0) { |
665 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_NETWORK_ADDR, value); | 645 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_NETWORK_ADDR, value); |
666 | 646 | ||
667 | if (parse_mac_address(value, mac_value) == ETH_ALEN) { | 647 | if (parse_mac_address(value, mac_value) == ETH_ALEN) |
668 | memcpy(lp->MACAddress, mac_value, ETH_ALEN); | 648 | memcpy(lp->MACAddress, mac_value, ETH_ALEN); |
669 | } else { | 649 | else |
670 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_NETWORK_ADDR); | 650 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_NETWORK_ADDR); |
671 | } | ||
672 | } else if (strcmp(key, PARM_NAME_AUTHENTICATION) == 0) { | 651 | } else if (strcmp(key, PARM_NAME_AUTHENTICATION) == 0) { |
673 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_AUTHENTICATION, value); | 652 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_AUTHENTICATION, value); |
674 | 653 | ||
675 | value_convert = simple_strtoul(value, NULL, 0); | 654 | value_convert = simple_strtoul(value, NULL, 0); |
676 | if ((value_convert >= PARM_MIN_AUTHENTICATION) && (value_convert <= PARM_MAX_AUTHENTICATION)) { | 655 | if ((value_convert >= PARM_MIN_AUTHENTICATION) && (value_convert <= PARM_MAX_AUTHENTICATION)) |
677 | lp->authentication = value_convert; | 656 | lp->authentication = value_convert; |
678 | } else { | 657 | else |
679 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_AUTHENTICATION); | 658 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_AUTHENTICATION); |
680 | } | ||
681 | } else if (strcmp(key, PARM_NAME_OWN_ATIM_WINDOW) == 0) { | 659 | } else if (strcmp(key, PARM_NAME_OWN_ATIM_WINDOW) == 0) { |
682 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_OWN_ATIM_WINDOW, value); | 660 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_OWN_ATIM_WINDOW, value); |
683 | 661 | ||
684 | value_convert = simple_strtoul(value, NULL, 0); | 662 | value_convert = simple_strtoul(value, NULL, 0); |
685 | if ((value_convert >= PARM_MIN_OWN_ATIM_WINDOW) && (value_convert <= PARM_MAX_OWN_ATIM_WINDOW)) { | 663 | if ((value_convert >= PARM_MIN_OWN_ATIM_WINDOW) && (value_convert <= PARM_MAX_OWN_ATIM_WINDOW)) |
686 | lp->atimWindow = value_convert; | 664 | lp->atimWindow = value_convert; |
687 | } else { | 665 | else |
688 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_OWN_ATIM_WINDOW); | 666 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_OWN_ATIM_WINDOW); |
689 | } | ||
690 | } else if (strcmp(key, PARM_NAME_PM_HOLDOVER_DURATION) == 0) { | 667 | } else if (strcmp(key, PARM_NAME_PM_HOLDOVER_DURATION) == 0) { |
691 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_PM_HOLDOVER_DURATION, value); | 668 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_PM_HOLDOVER_DURATION, value); |
692 | 669 | ||
693 | value_convert = simple_strtoul(value, NULL, 0); | 670 | value_convert = simple_strtoul(value, NULL, 0); |
694 | if ((value_convert >= PARM_MIN_PM_HOLDOVER_DURATION) && (value_convert <= PARM_MAX_PM_HOLDOVER_DURATION)) { | 671 | if ((value_convert >= PARM_MIN_PM_HOLDOVER_DURATION) && (value_convert <= PARM_MAX_PM_HOLDOVER_DURATION)) |
695 | lp->holdoverDuration = value_convert; | 672 | lp->holdoverDuration = value_convert; |
696 | } else { | 673 | else |
697 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_PM_HOLDOVER_DURATION); | 674 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_PM_HOLDOVER_DURATION); |
698 | } | ||
699 | } else if (strcmp(key, PARM_NAME_PROMISCUOUS_MODE) == 0) { | 675 | } else if (strcmp(key, PARM_NAME_PROMISCUOUS_MODE) == 0) { |
700 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_PROMISCUOUS_MODE, value); | 676 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_PROMISCUOUS_MODE, value); |
701 | lp->promiscuousMode = parse_yes_no(value); | 677 | lp->promiscuousMode = parse_yes_no(value); |
@@ -703,11 +679,10 @@ void translate_option(char *buffer, struct wl_private *lp) | |||
703 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_CONNECTION_CONTROL, value); | 679 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_CONNECTION_CONTROL, value); |
704 | 680 | ||
705 | value_convert = simple_strtoul(value, NULL, 0); | 681 | value_convert = simple_strtoul(value, NULL, 0); |
706 | if ((value_convert >= PARM_MIN_CONNECTION_CONTROL) && (value_convert <= PARM_MAX_CONNECTION_CONTROL)) { | 682 | if ((value_convert >= PARM_MIN_CONNECTION_CONTROL) && (value_convert <= PARM_MAX_CONNECTION_CONTROL)) |
707 | lp->connectionControl = value_convert; | 683 | lp->connectionControl = value_convert; |
708 | } else { | 684 | else |
709 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_CONNECTION_CONTROL); | 685 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_CONNECTION_CONTROL); |
710 | } | ||
711 | } | 686 | } |
712 | 687 | ||
713 | /* Need to add? : Probe Data Rate */ | 688 | /* Need to add? : Probe Data Rate */ |
@@ -722,11 +697,10 @@ void translate_option(char *buffer, struct wl_private *lp) | |||
722 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_OWN_DTIM_PERIOD, value); | 697 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_OWN_DTIM_PERIOD, value); |
723 | 698 | ||
724 | value_convert = simple_strtoul(value, NULL, 0); | 699 | value_convert = simple_strtoul(value, NULL, 0); |
725 | if (value_convert >= PARM_MIN_OWN_DTIM_PERIOD) { | 700 | if (value_convert >= PARM_MIN_OWN_DTIM_PERIOD) |
726 | lp->DTIMPeriod = value_convert; | 701 | lp->DTIMPeriod = value_convert; |
727 | } else { | 702 | else |
728 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_OWN_DTIM_PERIOD); | 703 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_OWN_DTIM_PERIOD); |
729 | } | ||
730 | } else if (strcmp(key, PARM_NAME_REJECT_ANY) == 0) { | 704 | } else if (strcmp(key, PARM_NAME_REJECT_ANY) == 0) { |
731 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_REJECT_ANY, value); | 705 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_REJECT_ANY, value); |
732 | lp->RejectAny = parse_yes_no(value); | 706 | lp->RejectAny = parse_yes_no(value); |
@@ -743,20 +717,18 @@ void translate_option(char *buffer, struct wl_private *lp) | |||
743 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_OWN_BEACON_INTERVAL, value); | 717 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_OWN_BEACON_INTERVAL, value); |
744 | 718 | ||
745 | value_convert = simple_strtoul(value, NULL, 0); | 719 | value_convert = simple_strtoul(value, NULL, 0); |
746 | if (value_convert >= PARM_MIN_OWN_BEACON_INTERVAL) { | 720 | if (value_convert >= PARM_MIN_OWN_BEACON_INTERVAL) |
747 | lp->ownBeaconInterval = value_convert; | 721 | lp->ownBeaconInterval = value_convert; |
748 | } else { | 722 | else |
749 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_OWN_BEACON_INTERVAL); | 723 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_OWN_BEACON_INTERVAL); |
750 | } | ||
751 | } else if (strcmp(key, PARM_NAME_COEXISTENCE) == 0) { | 724 | } else if (strcmp(key, PARM_NAME_COEXISTENCE) == 0) { |
752 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_COEXISTENCE, value); | 725 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_COEXISTENCE, value); |
753 | 726 | ||
754 | value_convert = simple_strtoul(value, NULL, 0); | 727 | value_convert = simple_strtoul(value, NULL, 0); |
755 | if (value_convert >= PARM_MIN_COEXISTENCE) { | 728 | if (value_convert >= PARM_MIN_COEXISTENCE) |
756 | lp->coexistence = value_convert; | 729 | lp->coexistence = value_convert; |
757 | } else { | 730 | else |
758 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_COEXISTENCE); | 731 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_COEXISTENCE); |
759 | } | ||
760 | } | 732 | } |
761 | 733 | ||
762 | #ifdef USE_WDS | 734 | #ifdef USE_WDS |
@@ -764,158 +736,140 @@ void translate_option(char *buffer, struct wl_private *lp) | |||
764 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_RTS_THRESHOLD1, value); | 736 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_RTS_THRESHOLD1, value); |
765 | 737 | ||
766 | value_convert = simple_strtoul(value, NULL, 0); | 738 | value_convert = simple_strtoul(value, NULL, 0); |
767 | if ((value_convert >= PARM_MIN_RTS_THRESHOLD) && (value_convert <= PARM_MAX_RTS_THRESHOLD)) { | 739 | if ((value_convert >= PARM_MIN_RTS_THRESHOLD) && (value_convert <= PARM_MAX_RTS_THRESHOLD)) |
768 | lp->wds_port[0].rtsThreshold = value_convert; | 740 | lp->wds_port[0].rtsThreshold = value_convert; |
769 | } else { | 741 | else |
770 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_RTS_THRESHOLD1); | 742 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_RTS_THRESHOLD1); |
771 | } | ||
772 | } else if (strcmp(key, PARM_NAME_RTS_THRESHOLD2) == 0) { | 743 | } else if (strcmp(key, PARM_NAME_RTS_THRESHOLD2) == 0) { |
773 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_RTS_THRESHOLD2, value); | 744 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_RTS_THRESHOLD2, value); |
774 | 745 | ||
775 | value_convert = simple_strtoul(value, NULL, 0); | 746 | value_convert = simple_strtoul(value, NULL, 0); |
776 | if ((value_convert >= PARM_MIN_RTS_THRESHOLD) && (value_convert <= PARM_MAX_RTS_THRESHOLD)) { | 747 | if ((value_convert >= PARM_MIN_RTS_THRESHOLD) && (value_convert <= PARM_MAX_RTS_THRESHOLD)) |
777 | lp->wds_port[1].rtsThreshold = value_convert; | 748 | lp->wds_port[1].rtsThreshold = value_convert; |
778 | } else { | 749 | else |
779 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_RTS_THRESHOLD2); | 750 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_RTS_THRESHOLD2); |
780 | } | ||
781 | } else if (strcmp(key, PARM_NAME_RTS_THRESHOLD3) == 0) { | 751 | } else if (strcmp(key, PARM_NAME_RTS_THRESHOLD3) == 0) { |
782 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_RTS_THRESHOLD3, value); | 752 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_RTS_THRESHOLD3, value); |
783 | 753 | ||
784 | value_convert = simple_strtoul(value, NULL, 0); | 754 | value_convert = simple_strtoul(value, NULL, 0); |
785 | if ((value_convert >= PARM_MIN_RTS_THRESHOLD) && (value_convert <= PARM_MAX_RTS_THRESHOLD)) { | 755 | if ((value_convert >= PARM_MIN_RTS_THRESHOLD) && (value_convert <= PARM_MAX_RTS_THRESHOLD)) |
786 | lp->wds_port[2].rtsThreshold = value_convert; | 756 | lp->wds_port[2].rtsThreshold = value_convert; |
787 | } else { | 757 | else |
788 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_RTS_THRESHOLD3); | 758 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_RTS_THRESHOLD3); |
789 | } | ||
790 | } else if (strcmp(key, PARM_NAME_RTS_THRESHOLD4) == 0) { | 759 | } else if (strcmp(key, PARM_NAME_RTS_THRESHOLD4) == 0) { |
791 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_RTS_THRESHOLD4, value); | 760 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_RTS_THRESHOLD4, value); |
792 | 761 | ||
793 | value_convert = simple_strtoul(value, NULL, 0); | 762 | value_convert = simple_strtoul(value, NULL, 0); |
794 | if ((value_convert >= PARM_MIN_RTS_THRESHOLD) && (value_convert <= PARM_MAX_RTS_THRESHOLD)) { | 763 | if ((value_convert >= PARM_MIN_RTS_THRESHOLD) && (value_convert <= PARM_MAX_RTS_THRESHOLD)) |
795 | lp->wds_port[3].rtsThreshold = value_convert; | 764 | lp->wds_port[3].rtsThreshold = value_convert; |
796 | } else { | 765 | else |
797 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_RTS_THRESHOLD4); | 766 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_RTS_THRESHOLD4); |
798 | } | ||
799 | } else if (strcmp(key, PARM_NAME_RTS_THRESHOLD5) == 0) { | 767 | } else if (strcmp(key, PARM_NAME_RTS_THRESHOLD5) == 0) { |
800 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_RTS_THRESHOLD5, value); | 768 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_RTS_THRESHOLD5, value); |
801 | 769 | ||
802 | value_convert = simple_strtoul(value, NULL, 0); | 770 | value_convert = simple_strtoul(value, NULL, 0); |
803 | if ((value_convert >= PARM_MIN_RTS_THRESHOLD) && (value_convert <= PARM_MAX_RTS_THRESHOLD)) { | 771 | if ((value_convert >= PARM_MIN_RTS_THRESHOLD) && (value_convert <= PARM_MAX_RTS_THRESHOLD)) |
804 | lp->wds_port[4].rtsThreshold = value_convert; | 772 | lp->wds_port[4].rtsThreshold = value_convert; |
805 | } else { | 773 | else |
806 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_RTS_THRESHOLD5); | 774 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_RTS_THRESHOLD5); |
807 | } | ||
808 | } else if (strcmp(key, PARM_NAME_RTS_THRESHOLD6) == 0) { | 775 | } else if (strcmp(key, PARM_NAME_RTS_THRESHOLD6) == 0) { |
809 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_RTS_THRESHOLD6, value); | 776 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_RTS_THRESHOLD6, value); |
810 | 777 | ||
811 | value_convert = simple_strtoul(value, NULL, 0); | 778 | value_convert = simple_strtoul(value, NULL, 0); |
812 | if ((value_convert >= PARM_MIN_RTS_THRESHOLD) && (value_convert <= PARM_MAX_RTS_THRESHOLD)) { | 779 | if ((value_convert >= PARM_MIN_RTS_THRESHOLD) && (value_convert <= PARM_MAX_RTS_THRESHOLD)) |
813 | lp->wds_port[5].rtsThreshold = value_convert; | 780 | lp->wds_port[5].rtsThreshold = value_convert; |
814 | } else { | 781 | else |
815 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_RTS_THRESHOLD6); | 782 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_RTS_THRESHOLD6); |
816 | } | ||
817 | } else if (strcmp(key, PARM_NAME_TX_RATE1) == 0) { | 783 | } else if (strcmp(key, PARM_NAME_TX_RATE1) == 0) { |
818 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_TX_RATE1, value); | 784 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_TX_RATE1, value); |
819 | 785 | ||
820 | value_convert = simple_strtoul(value, NULL, 0); | 786 | value_convert = simple_strtoul(value, NULL, 0); |
821 | if ((value_convert >= PARM_MIN_TX_RATE) && (value_convert <= PARM_MAX_TX_RATE)) { | 787 | if ((value_convert >= PARM_MIN_TX_RATE) && (value_convert <= PARM_MAX_TX_RATE)) |
822 | lp->wds_port[0].txRateCntl = value_convert; | 788 | lp->wds_port[0].txRateCntl = value_convert; |
823 | } else { | 789 | else |
824 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_TX_RATE1); | 790 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_TX_RATE1); |
825 | } | ||
826 | } else if (strcmp(key, PARM_NAME_TX_RATE2) == 0) { | 791 | } else if (strcmp(key, PARM_NAME_TX_RATE2) == 0) { |
827 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_TX_RATE2, value); | 792 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_TX_RATE2, value); |
828 | 793 | ||
829 | value_convert = simple_strtoul(value, NULL, 0); | 794 | value_convert = simple_strtoul(value, NULL, 0); |
830 | if ((value_convert >= PARM_MIN_TX_RATE) && (value_convert <= PARM_MAX_TX_RATE)) { | 795 | if ((value_convert >= PARM_MIN_TX_RATE) && (value_convert <= PARM_MAX_TX_RATE)) |
831 | lp->wds_port[1].txRateCntl = value_convert; | 796 | lp->wds_port[1].txRateCntl = value_convert; |
832 | } else { | 797 | else |
833 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_TX_RATE2); | 798 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_TX_RATE2); |
834 | } | ||
835 | } else if (strcmp(key, PARM_NAME_TX_RATE3) == 0) { | 799 | } else if (strcmp(key, PARM_NAME_TX_RATE3) == 0) { |
836 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_TX_RATE3, value); | 800 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_TX_RATE3, value); |
837 | 801 | ||
838 | value_convert = simple_strtoul(value, NULL, 0); | 802 | value_convert = simple_strtoul(value, NULL, 0); |
839 | if ((value_convert >= PARM_MIN_TX_RATE) && (value_convert <= PARM_MAX_TX_RATE)) { | 803 | if ((value_convert >= PARM_MIN_TX_RATE) && (value_convert <= PARM_MAX_TX_RATE)) |
840 | lp->wds_port[2].txRateCntl = value_convert; | 804 | lp->wds_port[2].txRateCntl = value_convert; |
841 | } else { | 805 | else |
842 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_TX_RATE3); | 806 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_TX_RATE3); |
843 | } | ||
844 | } else if (strcmp(key, PARM_NAME_TX_RATE4) == 0) { | 807 | } else if (strcmp(key, PARM_NAME_TX_RATE4) == 0) { |
845 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_TX_RATE4, value); | 808 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_TX_RATE4, value); |
846 | 809 | ||
847 | value_convert = simple_strtoul(value, NULL, 0); | 810 | value_convert = simple_strtoul(value, NULL, 0); |
848 | if ((value_convert >= PARM_MIN_TX_RATE) && (value_convert <= PARM_MAX_TX_RATE)) { | 811 | if ((value_convert >= PARM_MIN_TX_RATE) && (value_convert <= PARM_MAX_TX_RATE)) |
849 | lp->wds_port[3].txRateCntl = value_convert; | 812 | lp->wds_port[3].txRateCntl = value_convert; |
850 | } else { | 813 | else |
851 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_TX_RATE4); | 814 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_TX_RATE4); |
852 | } | ||
853 | } else if (strcmp(key, PARM_NAME_TX_RATE5) == 0) { | 815 | } else if (strcmp(key, PARM_NAME_TX_RATE5) == 0) { |
854 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_TX_RATE5, value); | 816 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_TX_RATE5, value); |
855 | 817 | ||
856 | value_convert = simple_strtoul(value, NULL, 0); | 818 | value_convert = simple_strtoul(value, NULL, 0); |
857 | if ((value_convert >= PARM_MIN_TX_RATE) && (value_convert <= PARM_MAX_TX_RATE)) { | 819 | if ((value_convert >= PARM_MIN_TX_RATE) && (value_convert <= PARM_MAX_TX_RATE)) |
858 | lp->wds_port[4].txRateCntl = value_convert; | 820 | lp->wds_port[4].txRateCntl = value_convert; |
859 | } else { | 821 | else |
860 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_TX_RATE5); | 822 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_TX_RATE5); |
861 | } | ||
862 | } else if (strcmp(key, PARM_NAME_TX_RATE6) == 0) { | 823 | } else if (strcmp(key, PARM_NAME_TX_RATE6) == 0) { |
863 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_TX_RATE6, value); | 824 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_TX_RATE6, value); |
864 | 825 | ||
865 | value_convert = simple_strtoul(value, NULL, 0); | 826 | value_convert = simple_strtoul(value, NULL, 0); |
866 | if ((value_convert >= PARM_MIN_TX_RATE) && (value_convert <= PARM_MAX_TX_RATE)) { | 827 | if ((value_convert >= PARM_MIN_TX_RATE) && (value_convert <= PARM_MAX_TX_RATE)) |
867 | lp->wds_port[5].txRateCntl = value_convert; | 828 | lp->wds_port[5].txRateCntl = value_convert; |
868 | } else { | 829 | else |
869 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_TX_RATE6); | 830 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_TX_RATE6); |
870 | } | ||
871 | } else if (strcmp(key, PARM_NAME_WDS_ADDRESS1) == 0) { | 831 | } else if (strcmp(key, PARM_NAME_WDS_ADDRESS1) == 0) { |
872 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_WDS_ADDRESS1, value); | 832 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_WDS_ADDRESS1, value); |
873 | 833 | ||
874 | if (parse_mac_address(value, mac_value) == ETH_ALEN) { | 834 | if (parse_mac_address(value, mac_value) == ETH_ALEN) |
875 | memcpy(lp->wds_port[0].wdsAddress, mac_value, ETH_ALEN); | 835 | memcpy(lp->wds_port[0].wdsAddress, mac_value, ETH_ALEN); |
876 | } else { | 836 | else |
877 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_WDS_ADDRESS1); | 837 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_WDS_ADDRESS1); |
878 | } | ||
879 | } else if (strcmp(key, PARM_NAME_WDS_ADDRESS2) == 0) { | 838 | } else if (strcmp(key, PARM_NAME_WDS_ADDRESS2) == 0) { |
880 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_WDS_ADDRESS2, value); | 839 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_WDS_ADDRESS2, value); |
881 | 840 | ||
882 | if (parse_mac_address(value, mac_value) == ETH_ALEN) { | 841 | if (parse_mac_address(value, mac_value) == ETH_ALEN) |
883 | memcpy(lp->wds_port[1].wdsAddress, mac_value, ETH_ALEN); | 842 | memcpy(lp->wds_port[1].wdsAddress, mac_value, ETH_ALEN); |
884 | } else { | 843 | else |
885 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_WDS_ADDRESS2); | 844 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_WDS_ADDRESS2); |
886 | } | ||
887 | } else if (strcmp(key, PARM_NAME_WDS_ADDRESS3) == 0) { | 845 | } else if (strcmp(key, PARM_NAME_WDS_ADDRESS3) == 0) { |
888 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_WDS_ADDRESS3, value); | 846 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_WDS_ADDRESS3, value); |
889 | 847 | ||
890 | if (parse_mac_address(value, mac_value) == ETH_ALEN) { | 848 | if (parse_mac_address(value, mac_value) == ETH_ALEN) |
891 | memcpy(lp->wds_port[2].wdsAddress, mac_value, ETH_ALEN); | 849 | memcpy(lp->wds_port[2].wdsAddress, mac_value, ETH_ALEN); |
892 | } else { | 850 | else |
893 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_WDS_ADDRESS3); | 851 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_WDS_ADDRESS3); |
894 | } | ||
895 | } else if (strcmp(key, PARM_NAME_WDS_ADDRESS4) == 0) { | 852 | } else if (strcmp(key, PARM_NAME_WDS_ADDRESS4) == 0) { |
896 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_WDS_ADDRESS4, value); | 853 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_WDS_ADDRESS4, value); |
897 | 854 | ||
898 | if (parse_mac_address(value, mac_value) == ETH_ALEN) { | 855 | if (parse_mac_address(value, mac_value) == ETH_ALEN) |
899 | memcpy(lp->wds_port[3].wdsAddress, mac_value, ETH_ALEN); | 856 | memcpy(lp->wds_port[3].wdsAddress, mac_value, ETH_ALEN); |
900 | } else { | 857 | else |
901 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_WDS_ADDRESS4); | 858 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_WDS_ADDRESS4); |
902 | } | ||
903 | } else if (strcmp(key, PARM_NAME_WDS_ADDRESS5) == 0) { | 859 | } else if (strcmp(key, PARM_NAME_WDS_ADDRESS5) == 0) { |
904 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_WDS_ADDRESS5, value); | 860 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_WDS_ADDRESS5, value); |
905 | 861 | ||
906 | if (parse_mac_address(value, mac_value) == ETH_ALEN) { | 862 | if (parse_mac_address(value, mac_value) == ETH_ALEN) |
907 | memcpy(lp->wds_port[4].wdsAddress, mac_value, ETH_ALEN); | 863 | memcpy(lp->wds_port[4].wdsAddress, mac_value, ETH_ALEN); |
908 | } else { | 864 | else |
909 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_WDS_ADDRESS5); | 865 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_WDS_ADDRESS5); |
910 | } | ||
911 | } else if (strcmp(key, PARM_NAME_WDS_ADDRESS6) == 0) { | 866 | } else if (strcmp(key, PARM_NAME_WDS_ADDRESS6) == 0) { |
912 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_WDS_ADDRESS6, value); | 867 | DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_WDS_ADDRESS6, value); |
913 | 868 | ||
914 | if (parse_mac_address(value, mac_value) == ETH_ALEN) { | 869 | if (parse_mac_address(value, mac_value) == ETH_ALEN) |
915 | memcpy(lp->wds_port[5].wdsAddress, mac_value, ETH_ALEN); | 870 | memcpy(lp->wds_port[5].wdsAddress, mac_value, ETH_ALEN); |
916 | } else { | 871 | else |
917 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_WDS_ADDRESS6); | 872 | DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_WDS_ADDRESS6); |
918 | } | ||
919 | } | 873 | } |
920 | #endif /* USE_WDS */ | 874 | #endif /* USE_WDS */ |
921 | } | 875 | } |
@@ -1045,12 +999,10 @@ void ParseConfigLine(char *pszLine, char **ppszLVal, char **ppszRVal) | |||
1045 | } | 999 | } |
1046 | /* make the line ending character(s) a NULL */ | 1000 | /* make the line ending character(s) a NULL */ |
1047 | for (i++; i < size; i++) { | 1001 | for (i++; i < size; i++) { |
1048 | if (pszLine[i] == '\n') { | 1002 | if (pszLine[i] == '\n') |
1049 | pszLine[i] = '\0'; | 1003 | pszLine[i] = '\0'; |
1050 | } | 1004 | if ((pszLine[i] == '\r') && (pszLine[i+1] == '\n')) |
1051 | if ((pszLine[i] == '\r') && (pszLine[i+1] == '\n')) { | ||
1052 | pszLine[i] = '\0'; | 1005 | pszLine[i] = '\0'; |
1053 | } | ||
1054 | } | 1006 | } |
1055 | } | 1007 | } |
1056 | DBG_LEAVE(DbgInfo); | 1008 | DBG_LEAVE(DbgInfo); |