---

yaml --- r: 249728 b: refs/heads/master c: 31bceb8 h: refs/heads/master v: v3
git-mirror · May 17, 2011 · f26efeb · f26efeb
1 parent 2c2c4cd
commit f26efeb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e0b3bf3abec4cd30c58e6311f913759a9e324d7
+refs/heads/master: 31bceb845e0f5393db1d9bf033d365cff7132c93
diff --git a/trunk/drivers/staging/hv/channel_mgmt.c b/trunk/drivers/staging/hv/channel_mgmt.c
@@ -419,6 +419,7 @@ static void vmbus_process_offer(struct work_struct *work)
 		 * can cleanup properly
 		 */
 		newchannel->state = CHANNEL_OPEN_STATE;
+		newchannel->util_index = -1; /* Invalid index */
 
 		/* Open IC channels */
 		for (cnt = 0; cnt < MAX_MSG_TYPES; cnt++) {
@@ -430,6 +431,7 @@ static void vmbus_process_offer(struct work_struct *work)
 						 hv_cb_utils[cnt].callback,
 						 newchannel) == 0) {
 				hv_cb_utils[cnt].channel = newchannel;
+				newchannel->util_index = cnt;
 
 				pr_info("%s\n", hv_cb_utils[cnt].log_msg);
 

diff --git a/trunk/drivers/staging/hv/hyperv.h b/trunk/drivers/staging/hv/hyperv.h
@@ -532,6 +532,11 @@ struct vmbus_channel {
 	struct work_struct work;
 
 	enum vmbus_channel_state state;
+	/*
+	 * For util channels, stash the
+	 * the service index for easy access.
+	 */
+	s8 util_index;
 
 	struct vmbus_channel_offer_channel offermsg;
 	/*