From 5ab4a8885298ab8d464b1455eacf8f9af58bf2c6 Mon Sep 17 00:00:00 2001
From: Haiyang Zhang <haiyangz@microsoft.com>
Date: Tue, 2 Oct 2012 05:30:20 +0000
Subject: [PATCH] --- yaml --- r: 328431 b: refs/heads/master c:
 ea4963745f712a746ccb45871a22e0814141a891 h: refs/heads/master i:   328429:
 57de384a24fe8b03683fc69f2eabb6b5fe1480eb   328427:
 630966b0e6fbbe8af65eb03bbc37af043ed200a4   328423:
 ef56a8df8903f5c8ee1505339f884d463253bb8b   328415:
 25cbb0d41621f5aa1251db02b99e8fc1f983b051 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/net/hyperv/rndis_filter.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4c9a58bad107..7b2f7f208f88 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb1d074edb92604f313ac671f67e806c3223d191
+refs/heads/master: ea4963745f712a746ccb45871a22e0814141a891
diff --git a/trunk/drivers/net/hyperv/rndis_filter.c b/trunk/drivers/net/hyperv/rndis_filter.c
index 1337b64b36a4..617eb2e4b06e 100644
--- a/trunk/drivers/net/hyperv/rndis_filter.c
+++ b/trunk/drivers/net/hyperv/rndis_filter.c
@@ -647,6 +647,7 @@ int rndis_filter_set_packet_filter(struct rndis_device *dev, u32 new_filter)
 	if (t == 0) {
 		netdev_err(ndev,
 			"timeout before we got a set response...\n");
+		ret = -ETIMEDOUT;
 		/*
 		 * We can't deallocate the request since we may still receive a
 		 * send completion for it.