[Feature][ZXW-241]merge P56U01 version
Only Configure: No
Affected branch: master
Affected module: unknow
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No
Change-Id: I7985538dde6951dd824c36149bf9a1e3ca23c734
diff --git a/ap/os/linux/linux-3.4.x/net/socket_rpmsg.c b/ap/os/linux/linux-3.4.x/net/socket_rpmsg.c
index 8b225b6..e7b2076 100755
--- a/ap/os/linux/linux-3.4.x/net/socket_rpmsg.c
+++ b/ap/os/linux/linux-3.4.x/net/socket_rpmsg.c
@@ -241,8 +241,8 @@
spin_lock(&sock_table_lock);
if(hlist_empty(&g_ipc_sockets))
{
- sk_soc_warn("sock_print_ipc_socket_info g_ipc_sockets is empty");
spin_unlock(&sock_table_lock);
+ sk_soc_warn("sock_print_ipc_socket_info g_ipc_sockets is empty");
return 0;
}
hlist_for_each_entry_safe(p, pos, n, &g_ipc_sockets, hlist_node) {
@@ -328,8 +328,8 @@
spin_lock(&sock_table_lock);
if(hlist_empty(&g_ipc_sockets))
{
- sk_soc_info("sock_soc_get_ipcsocket_by_proxysock g_ipc_sockets is empty");
spin_unlock(&sock_table_lock);
+ sk_soc_info("sock_soc_get_ipcsocket_by_proxysock g_ipc_sockets is empty");
return NULL;
}
hlist_for_each_entry_safe(p, pos, n, &g_ipc_sockets, hlist_node) {
@@ -350,8 +350,8 @@
spin_lock(&sock_table_lock);
if(hlist_empty(&g_ipc_sockets))
{
- sk_soc_info("sock_soc_get_ipcsocket_by_proxysock g_ipc_sockets is empty");
spin_unlock(&sock_table_lock);
+ sk_soc_info("sock_soc_get_ipcsocket_by_proxysock g_ipc_sockets is empty");
return NULL;
}
hlist_for_each_entry_safe(p, pos, n, &g_ipc_sockets, hlist_node) {
@@ -372,8 +372,8 @@
spin_lock(&sock_table_lock);
if(hlist_empty(&g_ipc_sockets))
{
- sk_soc_info("sock_get_ipcsocket_by_local_and_remote g_ipc_sockets is empty");
spin_unlock(&sock_table_lock);
+ sk_soc_info("sock_get_ipcsocket_by_local_and_remote g_ipc_sockets is empty");
return NULL;
}
hlist_for_each_entry_safe(p, pos, n, &g_ipc_sockets, hlist_node) {
@@ -393,8 +393,8 @@
spin_lock(&sock_table_lock);
if(hlist_empty(&g_ipc_sockets))
{
- sk_soc_info("sock_del_ipc_socket_by_proxysocket g_ipc_sockets is empty");
spin_unlock(&sock_table_lock);
+ sk_soc_info("sock_del_ipc_socket_by_proxysocket g_ipc_sockets is empty");
return -1;
}
hlist_for_each_entry_safe(p, pos, n, &g_ipc_sockets, hlist_node) {
@@ -417,8 +417,8 @@
spin_lock(&sock_table_lock);
if(hlist_empty(&g_ipc_sockets))
{
- sk_soc_info("sock_is_valide_ipc_socket g_ipc_sockets is empty");
spin_unlock(&sock_table_lock);
+ sk_soc_info("sock_is_valide_ipc_socket g_ipc_sockets is empty");
return -1;
}
hlist_for_each_entry_safe(p, pos, n, &g_ipc_sockets, hlist_node) {
@@ -541,8 +541,8 @@
spin_lock(&sock_table_lock);
if(hlist_empty(&g_ipc_sockets))
{
- sk_soc_info("sock_soc_socket_is_valid g_ipc_sockets is empty");
spin_unlock(&sock_table_lock);
+ sk_soc_info("sock_soc_socket_is_valid g_ipc_sockets is empty");
return -1;
}
hlist_for_each_entry_safe(p, pos, n, &g_ipc_sockets, hlist_node) {
@@ -563,8 +563,8 @@
spin_lock(&sock_table_lock);
if(hlist_empty(&g_ipc_sockets))
{
- sk_soc_info("sock_soc_del_socket_info g_ipc_sockets is empty");
spin_unlock(&sock_table_lock);
+ sk_soc_info("sock_soc_del_socket_info g_ipc_sockets is empty");
return -1;
}
hlist_for_each_entry_safe(p, pos, n, &g_ipc_sockets, hlist_node) {
@@ -593,8 +593,8 @@
spin_lock(&sock_table_lock);
if(hlist_empty(&g_ipc_sockets))
{
- sk_soc_info("sock_soc_socket_is_valid_ipc g_ipc_sockets is empty");
spin_unlock(&sock_table_lock);
+ sk_soc_info("sock_soc_socket_is_valid_ipc g_ipc_sockets is empty");
return -1;
}
hlist_for_each_entry_safe(p, pos, n, &g_ipc_sockets, hlist_node) {
@@ -677,13 +677,13 @@
if((p->sockaddr.sun_family == psockaddr_un->sun_family) && (0 == ret)){
hlist_del(&p->hlist_node);
kfree(p);
- sk_soc_info("sun_path=%s, del sucess.", psockaddr_un->sun_path);
spin_unlock(&sock_socketaddr_table_lock);
+ sk_soc_info("sun_path=%s, del sucess.", psockaddr_un->sun_path);
return 0;
}
}
- sk_soc_info("sun_path=%s, del failed", psockaddr_un->sun_path);
spin_unlock(&sock_socketaddr_table_lock);
+ sk_soc_info("sun_path=%s, del failed", psockaddr_un->sun_path);
return -1;
}
@@ -2309,8 +2309,8 @@
spin_lock(&sock_release_lock);
//ÅжÏsocketÐÅÏ¢ÊÇ·ñ»¹ÔÚ´úÀíÁ´±íÖÐ
if(0 != sock_is_valide_ipc_socket(psock_rpmsg->serversock, psock_rpmsg->serverproxysock, psock_rpmsg->clientsock)){
- sk_soc_info("sock_soc_release_peer_proc failed, sock_is_valide_ipc_socket=false \n");
spin_unlock(&sock_release_lock);
+ sk_soc_info("sock_soc_release_peer_proc failed, sock_is_valide_ipc_socket=false \n");
return -1;
}