diff options
| author | Allan Stephens <Allan.Stephens@windriver.com> | 2011-02-28 11:04:08 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-03-13 16:35:19 -0400 |
| commit | f9107ebe7d18a04f07d2a990a912efa2a2ac1873 (patch) | |
| tree | ec14aea5a5cf2a8de72af882517e76599751fc9f /net/tipc | |
| parent | d901a42b271dbd94983b798955403dcf1afa60ac (diff) | |
| download | kernel_samsung_aries-f9107ebe7d18a04f07d2a990a912efa2a2ac1873.zip kernel_samsung_aries-f9107ebe7d18a04f07d2a990a912efa2a2ac1873.tar.gz kernel_samsung_aries-f9107ebe7d18a04f07d2a990a912efa2a2ac1873.tar.bz2 | |
tipc: Don't respond to neighbor discovery request on blocked bearer
Adds a check to prevent TIPC from trying to respond to an incoming
LINK_CONFIG request message if the associated bearer is currently
prohibited from sending messages.
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/discover.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/discover.c b/net/tipc/discover.c index 2c14d6d..491eff5 100644 --- a/net/tipc/discover.c +++ b/net/tipc/discover.c @@ -202,7 +202,7 @@ void tipc_disc_recv_msg(struct sk_buff *buf, struct tipc_bearer *b_ptr) /* Accept discovery message & send response, if necessary */ link_fully_up = link_working_working(link); - if ((type == DSC_REQ_MSG) && !link_fully_up) { + if ((type == DSC_REQ_MSG) && !link_fully_up && !b_ptr->blocked) { rbuf = tipc_disc_init_msg(DSC_RESP_MSG, orig, b_ptr); if (rbuf) { b_ptr->media->send_msg(rbuf, b_ptr, &media_addr); |