[Feature][ZXW-33]merge ZXW 0428 version

Change-Id: I11f167edfea428d9fab198ff00ff1364932d1b0b
diff --git a/ap/lib/libwlan_interface/broadcom_interface.c b/ap/lib/libwlan_interface/broadcom_interface.c
index 76492f3..2947c17 100755
--- a/ap/lib/libwlan_interface/broadcom_interface.c
+++ b/ap/lib/libwlan_interface/broadcom_interface.c
@@ -273,11 +273,11 @@
 	

     if(authMode != NULL && encrypType != NULL)

     {  

-        printf("zte_wlan_ssid1_security_set authMode = [%s]\n", authMode);

-		printf("zte_wlan_ssid1_security_set encrypType = [%s]\n", encrypType);   

+        printf("wlan_ssid1_security_set authMode = [%s]\n", authMode);

+		printf("wlan_ssid1_security_set encrypType = [%s]\n", encrypType);   

 		if(NULL == password && (!(!strcmp(authMode, WF_AU_OPEN) && !strcmp(encrypType, WF_ENCRY_NONE))))

 		{

-			printf("zte_wlan_ssid1_security_set password is null\n");

+			printf("wlan_ssid1_security_set password is null\n");

 			return -1;

 		}

 		

@@ -290,7 +290,7 @@
 				len = strlen(password);

 				if(len != 5 || len != 10 || len != 13 || len != 26)

 				{

-					printf("zte_wlan_ssid1_security_set wep psk len = [%s]\n", len);  

+					printf("wlan_ssid1_security_set wep psk len = [%s]\n", len);  

 					return -1;

 				}

 				

@@ -310,7 +310,7 @@
 						}

 						else

 						{

-							printf("zte_wlan_ssid1_security_set wep psk is same\n");  

+							printf("wlan_ssid1_security_set wep psk is same\n");  

 							return 1;

 						}

 					}

@@ -325,7 +325,7 @@
 						}

 						else

 						{

-							printf("zte_wlan_ssid1_security_set wep psk is same\n");  

+							printf("wlan_ssid1_security_set wep psk is same\n");  

 							return 1;

 						}

 					}

@@ -340,7 +340,7 @@
 						}

 						else

 						{

-							printf("zte_wlan_ssid1_security_set wep psk is same\n");  

+							printf("wlan_ssid1_security_set wep psk is same\n");  

 							return 1;

 						}

 					}

@@ -355,7 +355,7 @@
 						}

 						else

 						{

-							printf("zte_wlan_ssid1_security_set wep psk is same\n");  

+							printf("wlan_ssid1_security_set wep psk is same\n");  

 							return 1;

 						}

 					}

@@ -489,8 +489,8 @@
 		

 		if(authMode != NULL && encrypType != NULL)

 		{  

-			printf("zte_wlan_ssid1_security_get authMode = [%s]\n", authMode);   

-			printf("zte_wlan_ssid1_security_get encrypType = [%s]\n", encrypType);   

+			printf("wlan_ssid1_security_get authMode = [%s]\n", authMode);   

+			printf("wlan_ssid1_security_get encrypType = [%s]\n", encrypType);   

 

 			if((!strcmp(authMode, WF_AU_OPEN))  || (!strcmp(authMode, WF_AU_SHARE)) ||  (!strcmp(authMode, WF_AU_WEPAUTO)))

 			{   

@@ -605,13 +605,13 @@
 	ret_for_basic = zte_wlan_ssid1_basic_set(ssid);

     if(-1 == ret_for_basic)

     {

-        printf("zte_wlan_ssid1_basic_set is false\n");

+        printf("wlan_ssid1_basic_set is false\n");

         return -1;

     }

 	ret_for_security = zte_wlan_ssid1_security_set(password);

     if(-1 == ret_for_security)

     {

-        printf("call zte_lan_ssid1_security_set failure .\n");   

+        printf("call lan_ssid1_security_set failure .\n");   

         return -1;

     }

 	

@@ -624,7 +624,7 @@
 		}

 		else

 		{

-			printf("wifi set cmd zte_wlan_ssid1_set error!\n");

+			printf("wifi set cmd wlan_ssid1_set error!\n");

 			return -1;

 		}

     }