diff options
| author | Nithin Raju <nithin@vmware.com> | 2015-11-25 12:00:56 -0800 |
|---|---|---|
| committer | Gurucharan Shetty <gshetty@nicira.com> | 2015-11-25 13:54:33 -0800 |
| commit | 12e888bae3b29b83d2c0877bbbfb07ce42089539 (patch) | |
| tree | 1e510de30e3542ee3857e4d7952f46a02e6fdf37 /datapath-windows/ovsext/IpHelper.c | |
| parent | 9be4a8373394c3afcf80a4b02a12a914e7fc1eb9 (diff) | |
| download | openvswitch-12e888bae3b29b83d2c0877bbbfb07ce42089539.tar.gz | |
datapath-windows: nuke port # argument in IP helper
Port # doesn't make much sense since it has not been computed yet.
Also, get rid of OVS_DEFAULT_PORT_NO and use OVS_DPPORT_NUMBER_INVALID
instead.
Signed-off-by: Nithin Raju <nithin@vmware.com>
Acked-by: Sairam Venugopal <vsairam@vmware.com>
Acked-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
Signed-off-by: Gurucharan Shetty <guru@ovn.org>
Diffstat (limited to 'datapath-windows/ovsext/IpHelper.c')
| -rw-r--r-- | datapath-windows/ovsext/IpHelper.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/datapath-windows/ovsext/IpHelper.c b/datapath-windows/ovsext/IpHelper.c index de0d4579a..812622201 100644 --- a/datapath-windows/ovsext/IpHelper.c +++ b/datapath-windows/ovsext/IpHelper.c @@ -38,7 +38,7 @@ KSTART_ROUTINE OvsStartIpHelper; * queued. */ static BOOLEAN ovsInternalIPConfigured; -static UINT32 ovsInternalPortNo; +static BOOLEAN ovsInternalAdapterUp; static GUID ovsInternalNetCfgId; static MIB_IF_ROW2 ovsInternalRow; static MIB_IPINTERFACE_ROW ovsInternalIPRow; @@ -1059,7 +1059,7 @@ VOID OvsInternalAdapterDown(VOID) { NdisAcquireSpinLock(&ovsIpHelperLock); - ovsInternalPortNo = OVS_DEFAULT_PORT_NO; + ovsInternalAdapterUp = FALSE; ovsInternalIPConfigured = FALSE; NdisReleaseSpinLock(&ovsIpHelperLock); @@ -1070,8 +1070,7 @@ OvsInternalAdapterDown(VOID) VOID -OvsInternalAdapterUp(UINT32 portNo, - GUID *netCfgInstanceId) +OvsInternalAdapterUp(GUID *netCfgInstanceId) { POVS_IP_HELPER_REQUEST request; @@ -1088,7 +1087,7 @@ OvsInternalAdapterUp(UINT32 portNo, request->command = OVS_IP_HELPER_INTERNAL_ADAPTER_UP; NdisAcquireSpinLock(&ovsIpHelperLock); - ovsInternalPortNo = portNo; + ovsInternalAdapterUp = TRUE; InsertHeadList(&ovsIpHelperRequestList, &request->link); ovsNumIpHelperRequests++; if (ovsNumIpHelperRequests == 1) { @@ -1160,7 +1159,7 @@ OvsEnqueueIpHelperRequest(POVS_IP_HELPER_REQUEST request) NdisAcquireSpinLock(&ovsIpHelperLock); - if (ovsInternalPortNo == OVS_DEFAULT_PORT_NO || + if (ovsInternalAdapterUp == FALSE || ovsInternalIPConfigured == FALSE) { NdisReleaseSpinLock(&ovsIpHelperLock); OvsFreeMemoryWithTag(request, OVS_IPHELPER_POOL_TAG); @@ -1554,7 +1553,7 @@ OvsInitIpHelper(NDIS_HANDLE ndisFilterHandle) RtlZeroMemory(&ovsInternalIPRow, sizeof (MIB_IPINTERFACE_ROW)); ovsInternalIP = 0; - ovsInternalPortNo = OVS_DEFAULT_PORT_NO; + ovsInternalAdapterUp = FALSE; InitializeListHead(&ovsSortedIPNeighList); |