diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/openflow/nicira-ext.h | 23 | ||||
| -rw-r--r-- | include/openvswitch/tunnel.h | 8 |
2 files changed, 6 insertions, 25 deletions
diff --git a/include/openflow/nicira-ext.h b/include/openflow/nicira-ext.h index 7df978b0c..738fd90d8 100644 --- a/include/openflow/nicira-ext.h +++ b/include/openflow/nicira-ext.h @@ -134,10 +134,7 @@ enum nicira_type { NXT_FLOW_END_CONFIG__OBSOLETE, NXT_FLOW_END__OBSOLETE, NXT_MGMT__OBSOLETE, - - /* Use the high 32 bits of the cookie field as the tunnel ID in the flow - * match. */ - NXT_TUN_ID_FROM_COOKIE, + NXT_TUN_ID_FROM_COOKIE__OBSOLETE, /* Controller role support. The request body is struct nx_role_request. * The reply echos the request. */ @@ -177,16 +174,6 @@ enum nicira_stats_type { NXST_AGGREGATE /* Analogous to OFPST_AGGREGATE. */ }; -/* NXT_TUN_ID_FROM_COOKIE request. */ -struct nxt_tun_id_cookie { - struct ofp_header header; - ovs_be32 vendor; /* NX_VENDOR_ID. */ - ovs_be32 subtype; /* NXT_TUN_ID_FROM_COOKIE */ - uint8_t set; /* Nonzero to enable, zero to disable. */ - uint8_t pad[7]; -}; -OFP_ASSERT(sizeof(struct nxt_tun_id_cookie) == 24); - /* This command enables or disables an Open vSwitch extension that allows a * controller to specify the OpenFlow table to which a flow should be added, * instead of having the switch decide which table is most appropriate as @@ -658,12 +645,6 @@ enum nx_mp_algorithm { */ NX_MP_ALG_ITER_HASH /* Iterative Hash. */ }; - -/* Wildcard for tunnel ID. */ -#define NXFW_TUN_ID (1 << 25) - -#define NXFW_ALL NXFW_TUN_ID -#define OVSFW_ALL (OFPFW_ALL | NXFW_ALL) /* Action structure for NXAST_AUTOPATH. * @@ -1219,8 +1200,6 @@ OFP_ASSERT(sizeof(struct nx_action_autopath) == 24); enum nx_flow_format { NXFF_OPENFLOW10 = 0, /* Standard OpenFlow 1.0 compatible. */ - NXFF_TUN_ID_FROM_COOKIE = 1, /* OpenFlow 1.0, plus obtain tunnel ID from - * cookie. */ NXFF_NXM = 2 /* Nicira extended match. */ }; diff --git a/include/openvswitch/tunnel.h b/include/openvswitch/tunnel.h index a394f8a8d..5e2e91644 100644 --- a/include/openvswitch/tunnel.h +++ b/include/openvswitch/tunnel.h @@ -65,8 +65,10 @@ enum { #define TNL_F_CSUM (1 << 0) /* Checksum packets. */ #define TNL_F_TOS_INHERIT (1 << 1) /* Inherit the ToS from the inner packet. */ #define TNL_F_TTL_INHERIT (1 << 2) /* Inherit the TTL from the inner packet. */ -#define TNL_F_PMTUD (1 << 3) /* Enable path MTU discovery. */ -#define TNL_F_HDR_CACHE (1 << 4) /* Enable tunnel header caching. */ -#define TNL_F_IPSEC (1 << 5) /* Traffic is IPsec encrypted. */ +#define TNL_F_DF_INHERIT (1 << 3) /* Inherit the DF bit from the inner packet. */ +#define TNL_F_DF_DEFAULT (1 << 4) /* Set the DF bit if inherit off or not IP. */ +#define TNL_F_PMTUD (1 << 5) /* Enable path MTU discovery. */ +#define TNL_F_HDR_CACHE (1 << 6) /* Enable tunnel header caching. */ +#define TNL_F_IPSEC (1 << 7) /* Traffic is IPsec encrypted. */ #endif /* openvswitch/tunnel.h */ |