Project

General

Profile

« Previous | Next » 

Revision 5357f386

Added by Erik Fonnesbeck over 14 years ago

Remove extra call to get_real_interface.

View differences:

etc/inc/interfaces.inc
3521 3521
	/* return wireless modes and channels */
3522 3522
	$wireless_modes = array();
3523 3523

  
3524
	$wlif = get_real_interface($interface);
3524
	$cloned_interface = get_real_interface($interface);
3525 3525

  
3526
	if($wlif != NULL && is_interface_wireless($wlif)) {
3527
		$cloned_interface = get_real_interface($interface);
3526
	if($cloned_interface && is_interface_wireless($cloned_interface)) {
3528 3527
		$chan_list = "/sbin/ifconfig {$cloned_interface} list chan";
3529 3528
		$stack_list = "/usr/bin/awk -F\"Channel \" '{ gsub(/\\*/, \" \"); print \$2 \"\\\n\" \$3 }'";
3530 3529
		$format_list = "/usr/bin/awk '{print \$5 \" \" \$6 \",\" \$1}'";
......
3567 3566
function get_wireless_channel_info($interface) {
3568 3567
	$wireless_channels = array();
3569 3568

  
3570
	$wlif = get_real_interface($interface);
3569
	$cloned_interface = get_real_interface($interface);
3571 3570

  
3572
	if($wlif != NULL && is_interface_wireless($wlif)) {
3573
		$cloned_interface = get_real_interface($interface);
3571
	if($cloned_interface && is_interface_wireless($cloned_interface)) {
3574 3572
		$chan_list = "/sbin/ifconfig {$cloned_interface} list txpower";
3575 3573
		$stack_list = "/usr/bin/awk -F\"Channel \" '{ gsub(/\\*/, \" \"); print \$2 \"\\\n\" \$3 }'";
3576 3574
		$format_list = "/usr/bin/awk '{print \$1 \",\" \$3 \" \" \$4 \",\" \$5 \",\" \$7}'";

Also available in: Unified diff