rc-scripts/trunk/sysconfig/network-scripts/functions.network

[arekm]

Author: arekm
Date: Sat Jan  7 16:57:27 2006
New Revision: 6762

Modified:
   rc-scripts/trunk/sysconfig/network-scripts/functions.network
Log:
ESSID setting is done only once, at the end just before commit.

Modified: rc-scripts/trunk/sysconfig/network-scripts/functions.network
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/functions.network	(original)
+++ rc-scripts/trunk/sysconfig/network-scripts/functions.network	Sat Jan  7 16:57:27 2006
@@ -453,8 +453,6 @@
 	[ -n "$(eval echo \$${prefix}WLAN_MODE)" ] && \
 		iwconfig ${device} mode "$(eval echo \$${prefix}WLAN_MODE)"
 	iwconfig ${device} nickname ${WLAN_NICKNAME}
-	[ -n "$(eval echo \$${prefix}WLAN_ESSID)" ] && \
-		iwconfig ${device} essid "$(eval echo \$${prefix}WLAN_ESSID)"
 	[ -n "$(eval echo \$${prefix}WLAN_NWID)" ] && \
 		iwconfig ${device} nwid "$(eval echo \$${prefix}WLAN_NWID)"
 	if [ -n "$(eval echo \$${prefix}WLAN_FREQ)" -a "$(eval echo \$${prefix}${WLAN_MODE})" != "Managed" ] ; then
@@ -486,15 +484,15 @@
 		iwconfig ${device} txpower "$(eval echo \$${prefix}WLAN_TXPOWER)"
 	[ -n "$(eval echo \$${prefix}WLAN_RETRY)" ] && \
 		iwconfig ${device} retry "$(eval echo \$${prefix}WLAN_RETRY)"
-	if is_yes "$(eval echo \$${prefix}WLAN_COMMIT)"; then
-		iwconfig ${device} commit
-	fi
 	[ -n "$(eval echo \$${prefix}WLAN_NWID)" ] && iwconfig ${device} \
 		nwid "$(eval echo \$${prefix}WLAN_NWID)"
 
-	#essid should be last due to netowork rescanning by wlan devices
+	# essid should be last due to netowork rescanning by wlan devices
 	[ -n "$(eval echo \$${prefix}WLAN_ESSID)" ] && iwconfig ${device} \
 		essid "$(eval echo \$${prefix}WLAN_ESSID)"
+
+	if is_yes "$(eval echo \$${prefix}WLAN_COMMIT)"; then
+		iwconfig ${device} commit
 }
 
 check_mii_tool ()