diff options
| author | Allan Stephens <allan.stephens@windriver.com> | 2011-10-24 19:05:55 +0200 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-12-27 17:33:50 +0100 |
| commit | 2b78f9a002dccc587912af4da3bf1db86909de91 (patch) | |
| tree | 60dafc91a970c116e7d8c3f53152a75f9e77d854 /net | |
| parent | tipc: Ensure broadcast link spinlock is held when updating node map (diff) | |
| download | linux-2b78f9a002dccc587912af4da3bf1db86909de91.tar.xz linux-2b78f9a002dccc587912af4da3bf1db86909de91.zip | |
tipc: Handle broadcast attempt when no neighboring nodes exist
Adds a check to detect when an attempt is made to send a message
via the broadcast link and no neighboring nodes are currently available
to receive it. Rather than wasting effort passing the message to the
broadcast link and broadcast bearer, who will only throw it away,
TIPC now frees the message immediately and reports success (i.e. the
message has been delivered to all available destinations).
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/tipc/bcast.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c index 5ca8fdda63ca..8f58df24bac5 100644 --- a/net/tipc/bcast.c +++ b/net/tipc/bcast.c @@ -417,13 +417,19 @@ int tipc_bclink_send_msg(struct sk_buff *buf) spin_lock_bh(&bc_lock); + if (!bclink->bcast_nodes.count) { + res = msg_data_sz(buf_msg(buf)); + buf_discard(buf); + goto exit; + } + res = tipc_link_send_buf(bcl, buf); if (likely(res > 0)) bclink_set_last_sent(); bcl->stats.queue_sz_counts++; bcl->stats.accu_queue_sz += bcl->out_queue_size; - +exit: spin_unlock_bh(&bc_lock); return res; } |