1 files changed, 14 insertions, 0 deletions

diff --git a/drivers/hv/connection.c b/drivers/hv/connection.c
index 253a74ba245c..ec3b8cdf1e04 100644
--- a/drivers/hv/connection.c
+++ b/drivers/hv/connection.c
@@ -246,12 +246,26 @@ struct vmbus_channel *relid2channel(u32 relid)
         struct vmbus_channel *channel;
         struct vmbus_channel *found_channel  = NULL;
         unsigned long flags;
+        struct list_head *cur, *tmp;
+        struct vmbus_channel *cur_sc;
 
         spin_lock_irqsave(&vmbus_connection.channel_lock, flags);
         list_for_each_entry(channel, &vmbus_connection.chn_list, listentry) {
                 if (channel->offermsg.child_relid == relid) {
                         found_channel = channel;
                         break;
+                } else if (!list_empty(&channel->sc_list)) {
+                        /*
+                         * Deal with sub-channels.
+                         */
+                        list_for_each_safe(cur, tmp, &channel->sc_list) {
+                                cur_sc = list_entry(cur, struct vmbus_channel,
+                                                        sc_list);
+                                if (cur_sc->offermsg.child_relid == relid) {
+                                        found_channel = cur_sc;
+                                        break;
+                                }
+                        }
                 }
         }
         spin_unlock_irqrestore(&vmbus_connection.channel_lock, flags);