diff options
| author | Jon Paul Maloy <jon.maloy@ericsson.com> | 2015-10-22 08:51:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-24 06:56:44 -0700 |
| commit | 60852d679575b0d7ce62497938116f92654ae908 (patch) | |
| tree | 767fe010b1c9e2c96d6c23dd91d652386a1a3ec7 /net/tipc/link.c | |
| parent | 959e1781aa230aecc90e4deb80117fd9a53dede7 (diff) | |
tipc: let neighbor discoverer tranmsit consumable buffers
The neighbor discovery function currently uses the function
tipc_bearer_send() for transmitting packets, assuming that the
sent buffers are not consumed by the called function.
We want to change this, in order to avoid unnecessary buffer cloning
elswhere in the code.
This commit introduces a new function tipc_bearer_skb() which consumes
the sent buffers, and let the discoverer functions use this new call
instead. The discoverer does now itself perform the cloning when
that is necessary.
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/link.c')
| -rw-r--r-- | net/tipc/link.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c index 3b98f8e70626..7d3b6e7d852a 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c @@ -1300,9 +1300,8 @@ void tipc_link_proto_xmit(struct tipc_link *l, u32 msg_typ, int probe_msg, skb = __skb_dequeue(&xmitq); if (!skb) return; - tipc_bearer_send(l->owner->net, l->bearer_id, skb, l->media_addr); + tipc_bearer_xmit_skb(l->owner->net, l->bearer_id, skb, l->media_addr); l->rcv_unacked = 0; - kfree_skb(skb); } static void tipc_link_build_proto_msg(struct tipc_link *l, int mtyp, bool probe, |