On Oct 28, 2014, at 8:44 AM, Ben Pfaff <[email protected]>
 wrote:

>> Signed-off-by: Nithin Raju <[email protected]>
> 
> Applied, thanks.
> 
> I had to apply the following hunk by hand because of a change in the
> context, please check that it is OK:
> 
> diff a/datapath-windows/ovsext/Switch.c b/datapath-windows/ovsext/Switch.c    
> (rejected hunks)
> @@ -428,6 +428,7 @@ OvsCleanupSwitchContext(POVS_SWITCH_CONTEXT switchContext)
> 
>     /* We need to do cleanup for tunnel port here. */
>     ASSERT(switchContext->numHvVports == 0);
> +    ASSERT(switchContext->numNonHvVports == 0);
> 
>     NdisFreeRWLock(switchContext->dispatchLock);
>     NdisFreeSpinLock(&(switchContext->pidHashLock));

Ben,

This looks fine. I'm surprised there was a conflict since I had merged it with 
pending patches.

Thanks,
-- Nithin
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev

Reply via email to