Acked-by: Eitan Eliahu <elia...@vmware.com>
-----Original Message-----
From: Samuel Ghinet [mailto:sghi...@cloudbasesolutions.com]
Sent: Tuesday, September 30, 2014 7:48 AM
To: dev@openvswitch.org
Cc: Alin Serdean; Nithin Raju; Eitan Eliahu; Ankur Sharma
Subject: [PATCH 05/14] datapath-windows: Define OVS_DPPORT_NUMBER_INVALID
This value represents the invalid number of the ovs (datapath) part of the
vport. It is currently 0, but when vport numbers will be constraint to less
than MAXUINT16, it will become MAXUINT16.
Reason for adding this symbol: a symbol is more clear of the intent than a
magic number. Also, it allows changing the value without modifying many parts
of the code.
Signed-off-by: Samuel Ghinet <sghi...@cloudbasesolutions.com>
---
datapath-windows/ovsext/Datapath.c | 2 +-
datapath-windows/ovsext/Vport.c | 2 +-
datapath-windows/ovsext/Vport.h | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/datapath-windows/ovsext/Datapath.c
b/datapath-windows/ovsext/Datapath.c
index 44cdfc9..d13f0c4 100644
--- a/datapath-windows/ovsext/Datapath.c
+++ b/datapath-windows/ovsext/Datapath.c
@@ -1426,7 +1426,7 @@ OvsGetVportDumpNext(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
if (outIndex >= inIndex) {
vport = CONTAINING_RECORD(link, OVS_VPORT_ENTRY, portLink);
- if (vport->portNo != 0) {
+ if (vport->portNo != OVS_DPPORT_NUMBER_INVALID) {
OvsCreateMsgFromVport(vport, msgIn,
usrParamsCtx->outputBuffer,
usrParamsCtx->outputLength, diff
--git a/datapath-windows/ovsext/Vport.c b/datapath-windows/ovsext/Vport.c index
b480e69..a6ad4f8 100644
--- a/datapath-windows/ovsext/Vport.c
+++ b/datapath-windows/ovsext/Vport.c
@@ -710,7 +710,7 @@ POVS_VPORT_ENTRY vport)
vport->nicIndex != 0) {
vport->portNo = OvsGetVportNo(switchContext, vport->nicIndex,
vport->ovsType, vport->portType == NdisSwitchPortTypeExternal);
- if (vport->portNo == 0) {
+ if (vport->portNo == OVS_DPPORT_NUMBER_INVALID) {
return NDIS_STATUS_RESOURCES;
}
ASSERT(OVS_IS_VPORT_ENTRY_NULL(switchContext,
diff --git a/datapath-windows/ovsext/Vport.h b/datapath-windows/ovsext/Vport.h
index 1e5346f..9cfbf0c 100644
--- a/datapath-windows/ovsext/Vport.h
+++ b/datapath-windows/ovsext/Vport.h
@@ -17,6 +17,8 @@
#ifndef __VPORT_H_
#define __VPORT_H_ 1
+#define OVS_DPPORT_NUMBER_INVALID 0
+
#include "Switch.h"
/*
--
1.8.3.msysgit.0
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
