GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tipc: same receive code path for connection protocol and data messages

Browse source 
As a preparation to eliminate port_lock we need to bring reception
of connection protocol messages under proper protection of bh_lock_sock
or socket owner.

We fix this by letting those messages follow the same code path as
incoming data messages.

As a side effect of this change, the last reference to the function
net_route_msg() disappears, and we can eliminate that function.

Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jon Paul Maloy 2014-06-25 20:41:40 -05:00 • committed by David S. Miller
parent b786e2b0fa
commit ec8a2e5621
6 changed files with 19 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

5
net/tipc/socket.c
View file

@ -1416,6 +1416,11 @@ static int filter_rcv(struct sock *sk, struct sk_buff *buf)
unsigned int limit = rcvbuf_limit(sk, buf);
int rc = TIPC_OK;
if (unlikely(msg_user(msg) == CONN_MANAGER)) {
tipc_port_proto_rcv(&tsk->port, buf);
return TIPC_OK;
}
/* Reject message if it is wrong sort of message for socket */
if (msg_type(msg) > TIPC_DIRECT_MSG)
return -TIPC_ERR_NO_PORT;