diff options
| author | Allan Stephens <allan.stephens@windriver.com> | 2011-04-05 15:15:04 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-09-01 11:16:35 -0400 |
| commit | ed33a9c4e354b08630bcf4cea70596f690487108 (patch) | |
| tree | dab46f277d18053d963ce17f8355dd3cea4e8fd2 /net/tipc/link.c | |
| parent | 5adeb17c936d2dca155e4c93e2c6ea70419a6033 (diff) | |
| download | linux-3.10-ed33a9c4e354b08630bcf4cea70596f690487108.tar.gz linux-3.10-ed33a9c4e354b08630bcf4cea70596f690487108.tar.bz2 linux-3.10-ed33a9c4e354b08630bcf4cea70596f690487108.zip | |
tipc: Eliminate obsolete filter for unexpected unicast messages
Removes a test that ensures unicast link endpoints discard an incoming
message if it will not be consumed by the node itself and cannot be
forwarded to another node, since the preceding test already ensures that
the message is destined for this node and single-cluster TIPC no longer
performs message forwarding.
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/tipc/link.c')
| -rw-r--r-- | net/tipc/link.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c index f89570c54f5..933764cdfe9 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c @@ -1658,19 +1658,12 @@ void tipc_recv_msg(struct sk_buff *head, struct tipc_bearer *b_ptr) continue; } + /* Discard unicast link messages destined for another node */ + if (unlikely(!msg_short(msg) && (msg_destnode(msg) != tipc_own_addr))) goto cont; - /* Discard non-routeable messages destined for another node */ - - if (unlikely(!msg_isdata(msg) && - (msg_destnode(msg) != tipc_own_addr))) { - if ((msg_user(msg) != CONN_MANAGER) && - (msg_user(msg) != MSG_FRAGMENTER)) - goto cont; - } - /* Locate neighboring node that sent message */ n_ptr = tipc_node_find(msg_prevnode(msg)); |