From 074bdce7e4c33c6c63d931e604d95ac9b05a1e96 Mon Sep 17 00:00:00 2001 From: Allan Stephens Date: Tue, 17 Aug 2010 11:00:08 +0000 Subject: [PATCH] --- yaml --- r: 213823 b: refs/heads/master c: 7e3e5d0950559d1118dccbdff3c765fffcf04fd5 h: refs/heads/master i: 213821: 1e69fa536fbc0c8d05a5d4093b3d79494444dba1 213819: 54157695f8ac97f65858675c784700e987a07af9 213815: fded766604bd1a397c7fc46d85cb691c1baea2aa 213807: f8d88d430a8b6d0ed2355384f8262bb671fec507 213791: f4b46c9f9e16ced2808771a279cee627f0666f00 213759: 63195d22733190b098815a12e7d9bd25340af21e v: v3 --- [refs] | 2 +- trunk/net/tipc/bcast.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 29b06e6ec796..682fcc8e3495 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b02b69c8a403859ec72090742727e853d606a325 +refs/heads/master: 7e3e5d0950559d1118dccbdff3c765fffcf04fd5 diff --git a/trunk/net/tipc/bcast.c b/trunk/net/tipc/bcast.c index a008c6689305..42b1737f0dcf 100644 --- a/trunk/net/tipc/bcast.c +++ b/trunk/net/tipc/bcast.c @@ -609,11 +609,13 @@ static int tipc_bcbearer_send(struct sk_buff *buf, bcbearer->remains = bcbearer->remains_new; } - /* Unable to reach all targets */ + /* + * Unable to reach all targets (indicate success, since currently + * there isn't code in place to properly block & unblock the + * pseudo-bearer used by the broadcast link) + */ - bcbearer->bearer.publ.blocked = 1; - bcl->stats.bearer_congs++; - return 1; + return TIPC_OK; } /**