diff options
| author | David S. Miller <davem@davemloft.net> | 2015-07-26 16:31:50 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-26 16:31:50 -0700 |
| commit | 1d70ec70ef3b5e3e5536d21d8fc82b25aba62d97 (patch) | |
| tree | a76895b3294564437b327e95dd1742daebbd56a9 /net/tipc/socket.h | |
| parent | a69e5a0dcfa4ea3e92b3cc0f17a39f1d88045c11 (diff) | |
| parent | cda3696d3d26eb798c94de0dab5bd66ddb5627cb (diff) | |
Merge branch 'tipc'
Jon Maloy says:
====================
tipc: clean up socket message reception
Despite recent improvements the message reception code in socket.c is
perceived as obscure and hard to follow, especially regarding the logics
for message rejection. With the commits in this series we try to remedy
this situation.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/socket.h')
| -rw-r--r-- | net/tipc/socket.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/socket.h b/net/tipc/socket.h index bf6551389522..4241f22069dc 100644 --- a/net/tipc/socket.h +++ b/net/tipc/socket.h @@ -44,7 +44,7 @@ SKB_TRUESIZE(TIPC_MAX_USER_MSG_SIZE)) int tipc_socket_init(void); void tipc_socket_stop(void); -int tipc_sk_rcv(struct net *net, struct sk_buff_head *inputq); +void tipc_sk_rcv(struct net *net, struct sk_buff_head *inputq); void tipc_sk_mcast_rcv(struct net *net, struct sk_buff_head *arrvq, struct sk_buff_head *inputq); void tipc_sk_reinit(struct net *net); |