[ovs-dev] [PATCH 2/4 v2] datapath-windows: Make _MapTunAttrToFlowPut() global

[Alin Serdean]

Acked-by: Alin Gabriel Serdean <aserdean at cloudbasesolutions.com>

> -----Mesaj original-----
> De la: dev [mailto:dev-bounces at openvswitch.org] În numele Nithin Raju
> Trimis: Tuesday, May 17, 2016 8:15 PM
> Către: dev at openvswitch.org
> Subiect: [ovs-dev] [PATCH 2/4 v2] datapath-windows: Make
> _MapTunAttrToFlowPut() global
> 
> Move this function out from file scope.
> 
> Signed-off-by: Nithin Raju <nithin at vmware.com>
> ---
>  datapath-windows/ovsext/Flow.c | 16 +++++++---------  datapath-
> windows/ovsext/Flow.h |  2 ++
>  2 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/datapath-windows/ovsext/Flow.c b/datapath-
> windows/ovsext/Flow.c index 1f23625..0682617 100644
> --- a/datapath-windows/ovsext/Flow.c
> +++ b/datapath-windows/ovsext/Flow.c
> @@ -54,9 +54,6 @@ static VOID _MapKeyAttrToFlowPut(PNL_ATTR
> *keyAttrs,
>                                   PNL_ATTR *tunnelAttrs,
>                                   OvsFlowKey *destKey);
> 
> -static VOID _MapTunAttrToFlowPut(PNL_ATTR *keyAttrs,
> -                                 PNL_ATTR *tunnelAttrs,
> -                                 OvsFlowKey *destKey);
>  static VOID _MapNlToFlowPutFlags(PGENL_MSG_HDR genlMsgHdr,
>                                   PNL_ATTR flowAttrClear,
>                                   OvsFlowPut *mappedFlow); @@ -207,6 +204,7 @@ const
> NL_POLICY nlFlowTunnelKeyPolicy[] = {
>      [OVS_TUNNEL_KEY_ATTR_GENEVE_OPTS] = {.type = NL_A_VAR_LEN,
>                                           .optional = TRUE}  };
> +const UINT32 nlFlowTunnelKeyPolicyLen =
> +ARRAY_SIZE(nlFlowTunnelKeyPolicy);
> 
>  /* For Parsing nested OVS_FLOW_ATTR_ACTIONS attributes */  const
> NL_POLICY nlFlowActionPolicy[] = { @@ -1409,7 +1407,7 @@
> _MapKeyAttrToFlowPut(PNL_ATTR *keyAttrs,
>                       PNL_ATTR *tunnelAttrs,
>                       OvsFlowKey *destKey)  {
> -    _MapTunAttrToFlowPut(keyAttrs, tunnelAttrs, destKey);
> +    MapTunAttrToFlowPut(keyAttrs, tunnelAttrs, destKey);
> 
>      if (keyAttrs[OVS_KEY_ATTR_RECIRC_ID]) {
>          destKey->recircId =
> NlAttrGetU32(keyAttrs[OVS_KEY_ATTR_RECIRC_ID]);
> @@ -1631,14 +1629,14 @@ _MapKeyAttrToFlowPut(PNL_ATTR *keyAttrs,
> 
>  /*
>   *----------------------------------------------------------------------------
> - *  _MapTunAttrToFlowPut --
> + *  MapTunAttrToFlowPut --
>   *    Converts FLOW_TUNNEL_KEY attribute to OvsFlowKey->tunKey.
>   *----------------------------------------------------------------------------
>   */
> -static VOID
> -_MapTunAttrToFlowPut(PNL_ATTR *keyAttrs,
> -                     PNL_ATTR *tunAttrs,
> -                     OvsFlowKey *destKey)
> +VOID
> +MapTunAttrToFlowPut(PNL_ATTR *keyAttrs,
> +                    PNL_ATTR *tunAttrs,
> +                    OvsFlowKey *destKey)
>  {
>      if (keyAttrs[OVS_KEY_ATTR_TUNNEL]) {
> 
> diff --git a/datapath-windows/ovsext/Flow.h b/datapath-
> windows/ovsext/Flow.h index 310c472..fb3fb59 100644
> --- a/datapath-windows/ovsext/Flow.h
> +++ b/datapath-windows/ovsext/Flow.h
> @@ -81,6 +81,8 @@ NTSTATUS MapFlowKeyToNlKey(PNL_BUFFER nlBuf,
> OvsFlowKey *flowKey,
>                             UINT16 keyType, UINT16 tunKeyType);  NTSTATUS
> MapFlowTunKeyToNlKey(PNL_BUFFER nlBuf, OvsIPv4TunnelKey *tunKey,
>                                UINT16 tunKeyType);
> +VOID MapTunAttrToFlowPut(PNL_ATTR *keyAttrs, PNL_ATTR *tunAttrs,
> +                         OvsFlowKey *destKey);
>  UINT32 OvsFlowKeyAttrSize(void);
>  UINT32 OvsTunKeyAttrSize(void);
> 
> --
> 2.7.1.windows.1
> 
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev