合并修改！！

pro/src/radius.c

@@ -423,7 +423,7 @@ int radius_init()
     }
 
     ////////////////////////////////////////////////////////////////
-
+#if 0
     sprintf(temp,"wpa_supplicant -i eth0 -c %s  -D wired -B",RADIUS_CONF);               
 
     ret = system(temp);
@@ -431,6 +431,7 @@ int radius_init()
     {
         LOGE("radius init failed!!\n");
     }
+#endif
     return 0;
 
 failed:

pro/src/switch_ctrl.c

@@ -1939,7 +1939,13 @@ int g_switch_get_t_ac_all_out_info(void* manger,int saddr,int nNumb,PowerInfo* _
         if(_power[i].factor > 0 && _power[i].factor <=1)
         {
             _power[i].app_power = _power[i].power / _power[i].factor;
-            _power[i].n_power = _power[i].app_power - _power[i].power;
+		    float app_power2 = _power[i].app_power * _power[i].app_power;
+			float power2 =_power[i].power * _power[i].power;
+			double f = (double)(app_power2) - power2;
+			if(f < 0.0)
+				_power[i].n_power = 0;
+			else
+				_power[i].n_power = (float)sqrt(f);
         }else
         {
             _power[i].app_power = 0;