[ovs-dev] [PATCH] datapath-windows: fix OVS_VPORT_TYPE

[Ben Pfaff]

On Wed, Sep 17, 2014 at 01:06:43PM +0000, Samuel Ghinet wrote:
> The windows ovs kernel uses an OVS_VPORT_TYPE enum that is incompatible with
> the userspace counterpart (enum ovs_vport_type from openvswitch.h). We must use
> the same enum type - enum ovs_vport_type - for the netlink communication to work
> properly.
> 
> This patch makes the fix: "typedef enum ovs_vport_type OVS_VPORT_TYPE" and
> changes the afferent kernel driver code:
> o) vport types synthetic and emulated turn to: netdev
> o) vport type internal turns to: internal
> o) vport type external truns to: netdev (plus, we hold a field in vport, "isExternal")
> 
> This patch is required for the ovs-dpctl show and vswitchd vport commands to work
> properly.
> 
> Signed-off-by: Samuel Ghinet <sghinet at cloudbasesolutions.com>

This didn't apply for me:

    Applying: datapath-windows: fix OVS_VPORT_TYPE
    error: patch failed: datapath-windows/include/OvsDpInterfaceExt.h:80
    error: datapath-windows/include/OvsDpInterfaceExt.h: patch does not apply
    error: patch failed: datapath-windows/ovsext/Vport.h:93
    error: datapath-windows/ovsext/Vport.h: patch does not apply
    Patch failed at 0001 datapath-windows: fix OVS_VPORT_TYPE
    The copy of the patch that failed is found in:
       /home/blp/nicira/ovs/.git/rebase-apply/patch
    When you have resolved this problem, run "git am --continue".
    If you prefer to skip this patch, run "git am --skip" instead.
    To restore the original branch and stop patching, run "git am --abort".