diff options
author | Nithin Raju <nithin@vmware.com> | 2016-08-31 03:33:01 -0700 |
---|---|---|
committer | Gurucharan Shetty <guru@ovn.org> | 2016-08-31 10:58:12 -0700 |
commit | 54f854e2aaf6f8f7c7bafb2f62557044c4648f56 (patch) | |
tree | 6013e1c442b3aea82beeefce67828ba8ecc820f7 /datapath-windows/ovsext/DpInternal.h | |
parent | 926c34fd7c2080543bf3ee63a4830e0dc5c4af12 (diff) | |
download | openvswitch-54f854e2aaf6f8f7c7bafb2f62557044c4648f56.tar.gz |
datapath-windows: remove invalid ASSERT in Flow.c
Since the Geneve changes, the key->l2.offset will no longer be 0 when
the tunnel key is valid within the OVS flow key. key->l2.offset would
be determined by the amount of tunnel options.
Signed-off-by: Nithin Raju <nithin@vmware.com>
Acked-by: Sairam Venugopal <vsairam@vmware.com>
Signed-off-by: Gurucharan Shetty <guru@ovn.org>
Diffstat (limited to 'datapath-windows/ovsext/DpInternal.h')
-rw-r--r-- | datapath-windows/ovsext/DpInternal.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/datapath-windows/ovsext/DpInternal.h b/datapath-windows/ovsext/DpInternal.h index 22599a0e2..f62fc55cb 100644 --- a/datapath-windows/ovsext/DpInternal.h +++ b/datapath-windows/ovsext/DpInternal.h @@ -157,17 +157,20 @@ typedef union OvsIPv4TunnelKey { uint64_t attr[NUM_PKT_ATTR_REQUIRED]; } OvsIPv4TunnelKey; /* Size of 280 byte. */ -__inline uint8_t TunnelKeyGetOptionsOffset(const OvsIPv4TunnelKey *key) +static __inline uint8_t +TunnelKeyGetOptionsOffset(const OvsIPv4TunnelKey *key) { return TUN_OPT_MAX_LEN - key->tunOptLen; } -__inline uint8_t* TunnelKeyGetOptions(OvsIPv4TunnelKey *key) +static __inline uint8_t * +TunnelKeyGetOptions(OvsIPv4TunnelKey *key) { return key->tunOpts + TunnelKeyGetOptionsOffset(key); } -__inline uint16_t TunnelKeyGetRealSize(OvsIPv4TunnelKey *key) +static __inline uint16_t +TunnelKeyGetRealSize(OvsIPv4TunnelKey *key) { return sizeof(OvsIPv4TunnelKey) - TunnelKeyGetOptionsOffset(key); } |