From b611d3acad951f4309ee7ac9ac802741102db6f0 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 20 Jan 2016 09:05:15 -0800 Subject: ofp-prop: Add generic functions for working with 16- and 32-bit properties. These will see increasing use in upcoming commits. Signed-off-by: Ben Pfaff Acked-by: Jarno Rajahalme --- include/openflow/openflow-1.4.h | 27 --------------------------- include/openflow/openflow-1.5.h | 18 ------------------ 2 files changed, 45 deletions(-) (limited to 'include/openflow') diff --git a/include/openflow/openflow-1.4.h b/include/openflow/openflow-1.4.h index daf6cf42e..b65eeb81c 100644 --- a/include/openflow/openflow-1.4.h +++ b/include/openflow/openflow-1.4.h @@ -94,15 +94,6 @@ enum ofp14_port_mod_prop_type { OFPPMPT14_EXPERIMENTER = 0xFFFF, /* Experimenter property. */ }; -/* Ethernet port mod property. */ -struct ofp14_port_mod_prop_ethernet { - ovs_be16 type; /* OFPPMPT14_ETHERNET. */ - ovs_be16 length; /* Length in bytes of this property. */ - ovs_be32 advertise; /* Bitmap of OFPPF_*. Zero all bits to prevent - any action taking place. */ -}; -OFP_ASSERT(sizeof(struct ofp14_port_mod_prop_ethernet) == 8); - struct ofp14_port_mod { ovs_be32 port_no; uint8_t pad[4]; @@ -137,13 +128,6 @@ enum ofp14_table_reason { OFPTR_N_REASONS /* Denotes number of reasons. */ }; -struct ofp14_table_mod_prop_eviction { - ovs_be16 type; /* OFPTMPT14_EVICTION. */ - ovs_be16 length; /* Length in bytes of this property. */ - ovs_be32 flags; /* Bitmap of OFPTMPEF14_* flags */ -}; -OFP_ASSERT(sizeof(struct ofp14_table_mod_prop_eviction) == 8); - struct ofp14_table_mod_prop_vacancy { ovs_be16 type; /* OFPTMPT14_VACANCY. */ ovs_be16 length; /* Length in bytes of this property. */ @@ -273,17 +257,6 @@ enum ofp14_async_config_prop_type { OFPTFPT_EXPERIMENTER_MASTER = 0xFFFF, /* Experimenter for master. */ }; -/* Various reason based properties */ -struct ofp14_async_config_prop_reasons { - /* 'type' is one of OFPACPT_PACKET_IN_*, OFPACPT_PORT_STATUS_*, - * OFPACPT_FLOW_REMOVED_*, OFPACPT_ROLE_STATUS_*, - * OFPACPT_TABLE_STATUS_*, OFPACPT_REQUESTFORWARD_*. */ - ovs_be16 type; - ovs_be16 length; /* Length in bytes of this property. */ - ovs_be32 mask; /* Bitmasks of reason values. */ -}; -OFP_ASSERT(sizeof(struct ofp14_async_config_prop_reasons) == 8); - /* Experimenter async config property */ struct ofp14_async_config_prop_experimenter { ovs_be16 type; /* One of OFPTFPT_EXPERIMENTER_SLAVE, diff --git a/include/openflow/openflow-1.5.h b/include/openflow/openflow-1.5.h index b3deb2d27..0c478d1f0 100644 --- a/include/openflow/openflow-1.5.h +++ b/include/openflow/openflow-1.5.h @@ -69,24 +69,6 @@ enum ofp15_group_bucket_prop_type { OFPGBPT15_EXPERIMENTER = 0xFFFF, /* Experimenter defined. */ }; -/* Group bucket weight property, for select groups only. */ -struct ofp15_group_bucket_prop_weight { - ovs_be16 type; /* OFPGBPT15_WEIGHT. */ - ovs_be16 length; /* 8. */ - ovs_be16 weight; /* Relative weight of bucket. */ - uint8_t pad[2]; /* Pad to 64 bits. */ -}; -OFP_ASSERT(sizeof(struct ofp15_group_bucket_prop_weight) == 8); - -/* Group bucket watch port or watch group property, for fast failover groups - * only. */ -struct ofp15_group_bucket_prop_watch { - ovs_be16 type; /* OFPGBPT15_WATCH_PORT or OFPGBPT15_WATCH_GROUP. */ - ovs_be16 length; /* 8. */ - ovs_be32 watch; /* The port or the group. */ -}; -OFP_ASSERT(sizeof(struct ofp15_group_bucket_prop_watch) == 8); - /* Bucket for use in groups. */ struct ofp15_bucket { ovs_be16 len; /* Length the bucket in bytes, including -- cgit v1.2.1