diff options
author | Jon Maloy <jon.maloy@ericsson.com> | 2018-01-08 21:03:26 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-01-09 12:35:57 -0500 |
commit | 7ad32bcb7855ae8a60a8cf98e1b9da77cfdba4d0 (patch) | |
tree | da31cea7f49f2793e536b42da165cea1caf00a1d /net/tipc/socket.c | |
parent | 0233493a5fad227645f7f02539cb42db72e76030 (diff) | |
download | linux-7ad32bcb7855ae8a60a8cf98e1b9da77cfdba4d0.tar.gz linux-7ad32bcb7855ae8a60a8cf98e1b9da77cfdba4d0.tar.bz2 linux-7ad32bcb7855ae8a60a8cf98e1b9da77cfdba4d0.zip |
tipc: create group member event messages when they are needed
In the current implementation, a group socket receiving topology
events about other members just converts the topology event message
into a group event message and stores it until it reaches the right
state to issue it to the user. This complicates the code unnecessarily,
and becomes impractical when we in the coming commits will need to
create and issue membership events independently.
In this commit, we change this so that we just notice the type and
origin of the incoming topology event, and then drop the buffer. Only
when it is time to actually send a group event to the user do we
explicitly create a new message and send it upwards.
Acked-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/socket.c')
-rw-r--r-- | net/tipc/socket.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index b51d5cba5094..36744ebef74f 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -1933,8 +1933,7 @@ static void tipc_sk_proto_rcv(struct sock *sk, break; case TOP_SRV: tipc_group_member_evt(tsk->group, &wakeup, &sk->sk_rcvbuf, - skb, inputq, xmitq); - skb = NULL; + hdr, inputq, xmitq); break; default: break; |