On 16 June 2016 at 10:17, Nithin Raju <nit...@vmware.com> wrote:
> Signed-off-by: Nithin Raju <nit...@vmware.com>
>
Applied.
> ---
> datapath-windows/ovsext/Flow.c | 20 ++++++++++----------
> datapath-windows/ovsext/Vxlan.c | 5 -----
> 2 files changed, 10 insertions(+), 15 deletions(-)
>
> diff --git a/datapath-windows/ovsext/Flow.c
> b/datapath-windows/ovsext/Flow.c
> index 2a91855..595518f 100644
> --- a/datapath-windows/ovsext/Flow.c
> +++ b/datapath-windows/ovsext/Flow.c
> @@ -1650,19 +1650,19 @@ MapTunAttrToFlowPut(PNL_ATTR *keyAttrs,
> if (keyAttrs[OVS_KEY_ATTR_TUNNEL]) {
>
> if (tunAttrs[OVS_TUNNEL_KEY_ATTR_ID]) {
> - destKey->tunKey.tunnelId = NlAttrGetU64
> - (tunAttrs[OVS_TUNNEL_KEY_ATTR_ID]);
> + destKey->tunKey.tunnelId =
> + NlAttrGetU64(tunAttrs[OVS_TUNNEL_KEY_ATTR_ID]);
> destKey->tunKey.flags |= OVS_TNL_F_KEY;
> }
>
> if (tunAttrs[OVS_TUNNEL_KEY_ATTR_IPV4_DST]) {
> - destKey->tunKey.dst = NlAttrGetU32
> - (tunAttrs[OVS_TUNNEL_KEY_ATTR_IPV4_DST]);
> + destKey->tunKey.dst =
> + NlAttrGetU32(tunAttrs[OVS_TUNNEL_KEY_ATTR_IPV4_DST]);
> }
>
> if (tunAttrs[OVS_TUNNEL_KEY_ATTR_IPV4_SRC]) {
> - destKey->tunKey.src = NlAttrGetU32
> - (tunAttrs[OVS_TUNNEL_KEY_ATTR_IPV4_SRC]);
> + destKey->tunKey.src =
> + NlAttrGetU32(tunAttrs[OVS_TUNNEL_KEY_ATTR_IPV4_SRC]);
> }
>
> if (tunAttrs[OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT]) {
> @@ -1674,13 +1674,13 @@ MapTunAttrToFlowPut(PNL_ATTR *keyAttrs,
> }
>
> if (tunAttrs[OVS_TUNNEL_KEY_ATTR_TOS]) {
> - destKey->tunKey.tos = NlAttrGetU8
> - (tunAttrs[OVS_TUNNEL_KEY_ATTR_TOS]);
> + destKey->tunKey.tos =
> + NlAttrGetU8(tunAttrs[OVS_TUNNEL_KEY_ATTR_TOS]);
> }
>
> if (tunAttrs[OVS_TUNNEL_KEY_ATTR_TTL]) {
> - destKey->tunKey.ttl = NlAttrGetU8
> - (tunAttrs[OVS_TUNNEL_KEY_ATTR_TTL]);
> + destKey->tunKey.ttl =
> + NlAttrGetU8(tunAttrs[OVS_TUNNEL_KEY_ATTR_TTL]);
> }
>
> destKey->tunKey.pad = 0;
> diff --git a/datapath-windows/ovsext/Vxlan.c
> b/datapath-windows/ovsext/Vxlan.c
> index f6a55f0..ddd8d8e 100644
> --- a/datapath-windows/ovsext/Vxlan.c
> +++ b/datapath-windows/ovsext/Vxlan.c
> @@ -194,11 +194,6 @@ OvsDoEncapVxlan(POVS_VPORT_ENTRY vport,
> ULONG mss = 0;
> NDIS_TCP_IP_CHECKSUM_NET_BUFFER_LIST_INFO csumInfo;
>
> - /*
> - * XXX: the assumption currently is that the NBL is owned by OVS, and
> - * headroom has already been allocated as part of allocating the NBL
> and
> - * MDL.
> - */
> curNb = NET_BUFFER_LIST_FIRST_NB(curNbl);
> packetLength = NET_BUFFER_DATA_LENGTH(curNb);
>
> --
> 2.6.2
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
>
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
