diff options
| author | Jon Paul Maloy <jon.maloy@ericsson.com> | 2014-05-14 05:39:12 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-14 15:19:48 -0400 |
| commit | 37e22164a8a3c39bdad45aa463b1e69a1fdf4110 (patch) | |
| tree | f59a133e852df71ad5d34615f60d08483ec1ed18 /net/tipc/node.h | |
| parent | 5074ab89c555dd130ceeac129546670423d634b8 (diff) | |
| download | blackbird-obmc-linux-37e22164a8a3c39bdad45aa463b1e69a1fdf4110.tar.gz blackbird-obmc-linux-37e22164a8a3c39bdad45aa463b1e69a1fdf4110.zip | |
tipc: rename and move message reassembly function
The function tipc_link_frag_rcv() is in reality a re-entrant generic
message reassemby function that has nothing in particular to do with
the link, where it is defined now. This becomes obvious when we see
the need to call the function from other places in the code.
In this commit rename it to tipc_buf_append() and move it to the file
msg.c. We also simplify its signature by moving the tail pointer to
the control block of the head buffer, hence making the head buffer
self-contained.
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/node.h')
| -rw-r--r-- | net/tipc/node.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/tipc/node.h b/net/tipc/node.h index 5454edf994c3..9087063793f2 100644 --- a/net/tipc/node.h +++ b/net/tipc/node.h @@ -69,8 +69,7 @@ enum { * @deferred_size: number of OOS b'cast messages in deferred queue * @deferred_head: oldest OOS b'cast message received from node * @deferred_tail: newest OOS b'cast message received from node - * @reasm_head: broadcast reassembly queue head from node - * @reasm_tail: last broadcast fragment received from node + * @reasm_buf: broadcast reassembly queue head from node * @recv_permitted: true if node is allowed to receive b'cast messages */ struct tipc_node_bclink { @@ -81,8 +80,7 @@ struct tipc_node_bclink { u32 deferred_size; struct sk_buff *deferred_head; struct sk_buff *deferred_tail; - struct sk_buff *reasm_head; - struct sk_buff *reasm_tail; + struct sk_buff *reasm_buf; bool recv_permitted; }; |
