From patchwork Tue Apr 12 17:12:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nithin Raju X-Patchwork-Id: 609506 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3qktm33rRSz9t0t for ; Wed, 13 Apr 2016 03:12:33 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id C87D51026E; Tue, 12 Apr 2016 10:12:31 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v3.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id 215C61026D for ; Tue, 12 Apr 2016 10:12:30 -0700 (PDT) Received: from bar6.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id A85AD1622C1 for ; Tue, 12 Apr 2016 11:12:29 -0600 (MDT) X-ASG-Debug-ID: 1460481148-0b32373b101add0001-byXFYA Received: from mx1-pf2.cudamail.com ([192.168.24.2]) by bar6.cudamail.com with ESMTP id mHGrcqVYrbsTNV7I (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 12 Apr 2016 11:12:28 -0600 (MDT) X-Barracuda-Envelope-From: nithin@vmware.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.2 Received: from unknown (HELO smtp-outbound-1.vmware.com) (208.91.2.12) by mx1-pf2.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 12 Apr 2016 17:12:28 -0000 Received-SPF: error (mx1-pf2.cudamail.com: error in processing during lookup of vmware.com: DNS problem) X-Barracuda-Apparent-Source-IP: 208.91.2.12 X-Barracuda-RBL-IP: 208.91.2.12 Received: from sc9-mailhost1.vmware.com (sc9-mailhost1.vmware.com [10.113.161.71]) by smtp-outbound-1.vmware.com (Postfix) with ESMTP id 6071F28A9C for ; Tue, 12 Apr 2016 10:12:26 -0700 (PDT) Received: from pa-dbc1118.eng.vmware.com (unknown [10.162.210.18]) by sc9-mailhost1.vmware.com (Postfix) with ESMTP id 016FE186E9; Tue, 12 Apr 2016 10:12:27 -0700 (PDT) X-CudaMail-Envelope-Sender: nithin@vmware.com From: Nithin Raju To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E2-411052371 X-CudaMail-DTE: 041216 X-CudaMail-Originating-IP: 208.91.2.12 Date: Tue, 12 Apr 2016 10:12:26 -0700 X-ASG-Orig-Subj: [##CM-E2-411052371##][PATCH v3] datapath-windows: cleanup after NdisRegisterDeviceEx() Message-Id: <1460481146-18221-1-git-send-email-nithin@vmware.com> X-Mailer: git-send-email 2.6.2 X-Barracuda-Connect: UNKNOWN[192.168.24.2] X-Barracuda-Start-Time: 1460481148 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 X-ASG-Whitelist: EmailCat (corporate) Subject: [ovs-dev] [PATCH v3] datapath-windows: cleanup after NdisRegisterDeviceEx() X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" The error handling code seems to be wrong. Signed-off-by: Nithin Raju --- datapath-windows/ovsext/Datapath.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/datapath-windows/ovsext/Datapath.c b/datapath-windows/ovsext/Datapath.c index 8c0c246..0a25af0 100644 --- a/datapath-windows/ovsext/Datapath.c +++ b/datapath-windows/ovsext/Datapath.c @@ -459,17 +459,11 @@ OvsCreateDeviceObject(NDIS_HANDLE ovsExtDriverHandle) &deviceAttributes, &gOvsDeviceObject, &gOvsDeviceHandle); - if (status != NDIS_STATUS_SUCCESS) { - POVS_DEVICE_EXTENSION ovsExt = - (POVS_DEVICE_EXTENSION)NdisGetDeviceReservedExtension(gOvsDeviceObject); - ASSERT(gOvsDeviceObject != NULL); - ASSERT(gOvsDeviceHandle != NULL); - - if (ovsExt) { - ovsExt->numberOpenInstance = 0; - } - } else { + if (status == NDIS_STATUS_SUCCESS) { OvsRegisterSystemProvider((PVOID)gOvsDeviceObject); + } else { + OVS_LOG_ERROR("Failed to regiser pseudo device, error: 0x%08x", + status); } OVS_LOG_TRACE("DeviceObject: %p", gOvsDeviceObject);