[ovs-dev] [PATCH v1 6/6] datapath-windows: Fixes during integration testing.
Eitan Eliahu
eliahue at vmware.com
Tue Oct 21 16:11:18 UTC 2014
LG
Acked-by: Eitan Eliahu <eliahue at vmware.com>
(I notice you fixed an issue in a previous patch)
-----Original Message-----
From: dev [mailto:dev-bounces at openvswitch.org] On Behalf Of Ankur Sharma
Sent: Monday, October 20, 2014 5:35 PM
To: dev at openvswitch.org
Subject: [ovs-dev] [PATCH v1 6/6] datapath-windows: Fixes during integration testing.
Signed-off-by: Ankur Sharma <ankursharma at vmware.com>
---
datapath-windows/ovsext/User.c | 6 ++++-- datapath-windows/ovsext/User.h | 6 +++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/datapath-windows/ovsext/User.c b/datapath-windows/ovsext/User.c index 42b251f..cce99a5 100644
--- a/datapath-windows/ovsext/User.c
+++ b/datapath-windows/ovsext/User.c
@@ -141,6 +141,7 @@ OvsSubscribeDpIoctl(PVOID instanceP,
OvsReleaseCtrlLock();
return STATUS_INVALID_PARAMETER;
}
+ OvsReleaseCtrlLock();
if (instance->packetQueue && !join) {
/* unsubscribe */
@@ -171,7 +172,6 @@ OvsSubscribeDpIoctl(PVOID instanceP,
OvsAddPidInstance(gOvsSwitchContext, pid, instance);
OvsReleaseCtrlLock();
-
} else {
/* user mode should call only once for subscribe */
return STATUS_INVALID_PARAMETER; @@ -1009,7 +1009,9 @@ OvsCreateQueueNlPacket(PVOID userData,
return NULL;
}
- if (!OvsGetPid(vport, nb, &pid)) {
+ OvsGetPid(vport, nb, &pid);
+
+ if (!pid) {
/*
* There is no userspace queue created yet, so there is no point for
* creating a new packet to be queued.
diff --git a/datapath-windows/ovsext/User.h b/datapath-windows/ovsext/User.h index 47fb10b..139b0ca 100644
--- a/datapath-windows/ovsext/User.h
+++ b/datapath-windows/ovsext/User.h
@@ -1,4 +1,4 @@
-/*
+ /*
* Copyright (c) 2014 VMware, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); @@ -49,6 +49,7 @@ typedef struct _OVS_USER_PACKET_QUEUE { } OVS_USER_PACKET_QUEUE, *POVS_USER_PACKET_QUEUE;
typedef struct _OVS_PACKET_QUEUE_ELEM {
+ UINT32 upcallPid;
LIST_ENTRY link;
OVS_PACKET_HDR_INFO hdrInfo;
OVS_PACKET_INFO packet;
@@ -78,8 +79,7 @@ POVS_PACKET_QUEUE_ELEM OvsCreateQueueNlPacket(PVOID userData,
BOOLEAN isRecv,
POVS_PACKET_HDR_INFO hdrInfo);
-VOID OvsQueuePackets(UINT32 queueId, PLIST_ENTRY packetList,
- UINT32 numElems);
+VOID OvsQueuePackets(PLIST_ENTRY packetList, UINT32 numElems);
NTSTATUS OvsCreateAndAddPackets(PVOID userData,
UINT32 userDataLen,
UINT32 cmd,
--
1.9.1
_______________________________________________
dev mailing list
dev at openvswitch.org
https://urldefense.proofpoint.com/v1/url?u=http://openvswitch.org/mailman/listinfo/dev&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=yTvML8OxA42Jb6ViHe7fUXbvPVOYDPVq87w43doxtlY%3D%0A&m=xGwUwitLxydNuEyu%2FO%2F5%2FRG1svN736UTMxwJ04XW3u0%3D%0A&s=cbe29bca94fb3d811daa6313993b09fd07609931a49c40aeabbb0cffed71d4b8
More information about the dev
mailing list