From 57bc486ef36bf3fa1f3999c7c36f23772237d36c Mon Sep 17 00:00:00 2001 From: Allan Stephens Date: Fri, 7 Oct 2011 15:48:41 -0400 Subject: [PATCH] --- yaml --- r: 279092 b: refs/heads/master c: d6d4577ae48bcfde06894540ea793abf076e1643 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/tipc/discover.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c19df4ebec97..3e5b114f5aac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d749a6a26b0811b4b2bb4ec2c47cd630a6bbf88 +refs/heads/master: d6d4577ae48bcfde06894540ea793abf076e1643 diff --git a/trunk/net/tipc/discover.c b/trunk/net/tipc/discover.c index 1ea2d44bbc36..420e0329036b 100644 --- a/trunk/net/tipc/discover.c +++ b/trunk/net/tipc/discover.c @@ -130,12 +130,15 @@ void tipc_disc_recv_msg(struct sk_buff *buf, struct tipc_bearer *b_ptr) u32 type = msg_type(msg); int link_fully_up; + media_addr.broadcast = 1; b_ptr->media->msg2addr(&media_addr, msg_media_addr(msg)); buf_discard(buf); /* Validate discovery message from requesting node */ if (net_id != tipc_net_id) return; + if (media_addr.broadcast) + return; if (!tipc_addr_domain_valid(dest)) return; if (!tipc_addr_node_valid(orig))