From b5ad383534a995ea8c162f6d755860f6925d9a3a Mon Sep 17 00:00:00 2001 From: Allan Stephens Date: Thu, 7 Apr 2011 10:22:31 -0400 Subject: [PATCH] --- yaml --- r: 266101 b: refs/heads/master c: 2e2d9be8454e295374dfbddd7ceaba2e4fc01c76 h: refs/heads/master i: 266099: 1092b002f4e2b8c773482e09692be624871c2d64 v: v3 --- [refs] | 2 +- trunk/net/tipc/bcast.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 608ef46c0b10..6af629f69474 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 641c218d120b03bdea4f658ab44930587cff9158 +refs/heads/master: 2e2d9be8454e295374dfbddd7ceaba2e4fc01c76 diff --git a/trunk/net/tipc/bcast.c b/trunk/net/tipc/bcast.c index 759b318b5ffb..411c54b152f0 100644 --- a/trunk/net/tipc/bcast.c +++ b/trunk/net/tipc/bcast.c @@ -764,7 +764,7 @@ int tipc_bclink_init(void) bcbearer = kzalloc(sizeof(*bcbearer), GFP_ATOMIC); bclink = kzalloc(sizeof(*bclink), GFP_ATOMIC); if (!bcbearer || !bclink) { - warn("Multicast link creation failed, no memory\n"); + warn("Broadcast link creation failed, no memory\n"); kfree(bcbearer); bcbearer = NULL; kfree(bclink); @@ -775,7 +775,7 @@ int tipc_bclink_init(void) INIT_LIST_HEAD(&bcbearer->bearer.cong_links); bcbearer->bearer.media = &bcbearer->media; bcbearer->media.send_msg = tipc_bcbearer_send; - sprintf(bcbearer->media.name, "tipc-multicast"); + sprintf(bcbearer->media.name, "tipc-broadcast"); bcl = &bclink->link; INIT_LIST_HEAD(&bcl->waiting_ports);