From 9fbbfb709874c8fdfae009e9ffe9ad19646a2779 Mon Sep 17 00:00:00 2001 From: Haiyang Zhang Date: Wed, 25 Jul 2012 08:08:42 +0000 Subject: [PATCH] --- yaml --- r: 318925 b: refs/heads/master c: 5243e7bd98b2dfecef3acd82661b541905a86e7f h: refs/heads/master i: 318923: a89ff13252d3abff87026e95338911ec1cbb177b v: v3 --- [refs] | 2 +- trunk/drivers/net/hyperv/rndis_filter.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 75da8a7b6012..a8f5b99a64d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa85a6c29a493e8a574bf62a6349b38b591bf885 +refs/heads/master: 5243e7bd98b2dfecef3acd82661b541905a86e7f diff --git a/trunk/drivers/net/hyperv/rndis_filter.c b/trunk/drivers/net/hyperv/rndis_filter.c index fbf539468205..e5d6146937fa 100644 --- a/trunk/drivers/net/hyperv/rndis_filter.c +++ b/trunk/drivers/net/hyperv/rndis_filter.c @@ -804,18 +804,15 @@ int rndis_filter_device_add(struct hv_device *dev, /* Send the rndis initialization message */ ret = rndis_filter_init_device(rndis_device); if (ret != 0) { - /* - * TODO: If rndis init failed, we will need to shut down the - * channel - */ + rndis_filter_device_remove(dev); + return ret; } /* Get the mac address */ ret = rndis_filter_query_device_mac(rndis_device); if (ret != 0) { - /* - * TODO: shutdown rndis device and the channel - */ + rndis_filter_device_remove(dev); + return ret; } memcpy(device_info->mac_adr, rndis_device->hw_mac_adr, ETH_ALEN);