Openflow (v6): use BASE_SPECIAL_VALS

for avoid duplicated hf

(like for v5 4b90e93f37cb092472db314ca0df3ce9503e1827)

Change-Id: I2f535e2ed06444959d4c1f1c089fec9693a8b96d
Reviewed-on: https://code.wireshark.org/review/21670
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

1 files changed, 102 insertions, 605 deletions

diff --git a/epan/dissectors/packet-openflow_v6.c b/epan/dissectors/packet-openflow_v6.c
index b6beccb2b5..89828e7e2e 100644
--- a/epan/dissectors/packet-openflow_v6.c
+++ b/epan/dissectors/packet-openflow_v6.c
@@ -72,9 +72,7 @@ static int hf_openflow_v6_action_length = -1;
 static int hf_openflow_v6_action_experimenter_experimenter = -1;
 static int hf_openflow_v6_oxm_experimenter_value = -1;
 static int hf_openflow_v6_action_output_port = -1;
-static int hf_openflow_v6_action_output_port_reserved = -1;
 static int hf_openflow_v6_action_output_max_len = -1;
-static int hf_openflow_v6_action_output_max_len_reserved = -1;
 static int hf_openflow_v6_action_output_pad = -1;
 static int hf_openflow_v6_action_copy_ttl_out_pad = -1;
 static int hf_openflow_v6_action_copy_ttl_in_pad = -1;
@@ -90,7 +88,6 @@ static int hf_openflow_v6_action_pop_mpls_ethertype = -1;
 static int hf_openflow_v6_action_pop_mpls_pad = -1;
 static int hf_openflow_v6_action_set_queue_queue_id = -1;
 static int hf_openflow_v6_action_group_group_id = -1;
-static int hf_openflow_v6_action_group_group_id_reserved = -1;
 static int hf_openflow_v6_action_set_nw_ttl_ttl = -1;
 static int hf_openflow_v6_action_set_nw_ttl_pad = -1;
 static int hf_openflow_v6_action_dec_nw_ttl_pad = -1;
@@ -113,7 +110,6 @@ static int hf_openflow_v6_instruction_write_metadata_value = -1;
 static int hf_openflow_v6_instruction_write_metadata_mask = -1;
 static int hf_openflow_v6_instruction_actions_pad = -1;
 static int hf_openflow_v6_instruction_meter_meter_id = -1;
-static int hf_openflow_v6_instruction_meter_meter_id_reserved = -1;
 static int hf_openflow_v6_port_desc_prop_type = -1;
 static int hf_openflow_v6_port_desc_prop_length = -1;
 static int hf_openflow_v6_port_desc_prop_ethernet_pad = -1;
@@ -204,7 +200,6 @@ static int hf_openflow_v6_port_desc_prop_ethernet_peer_pause_asym = -1;
 static int hf_openflow_v6_port_desc_prop_ethernet_curr_speed = -1;
 static int hf_openflow_v6_port_desc_prop_ethernet_max_speed = -1;
 static int hf_openflow_v6_port_port_no = -1;
-static int hf_openflow_v6_port_port_no_reserved = -1;
 static int hf_openflow_v6_port_length = -1;
 static int hf_openflow_v6_port_pad = -1;
 static int hf_openflow_v6_port_hw_addr = -1;
@@ -274,9 +269,7 @@ static int hf_openflow_v6_switch_features_reserved = -1;
 static int hf_openflow_v6_switch_config_flags = -1;
 static int hf_openflow_v6_switch_config_flags_fragments = -1;
 static int hf_openflow_v6_switch_config_miss_send_len = -1;
-static int hf_openflow_v6_switch_config_miss_send_len_reserved = -1;
 static int hf_openflow_v6_packet_in_buffer_id = -1;
-static int hf_openflow_v6_packet_in_buffer_id_reserved = -1;
 static int hf_openflow_v6_packet_in_total_len = -1;
 static int hf_openflow_v6_packet_in_reason = -1;
 static int hf_openflow_v6_packet_in_table_id = -1;
@@ -295,25 +288,19 @@ static int hf_openflow_v6_flow_removed_byte_count = -1;
 static int hf_openflow_v6_port_status_reason = -1;
 static int hf_openflow_v6_port_status_pad = -1;
 static int hf_openflow_v6_packet_out_buffer_id = -1;
-static int hf_openflow_v6_packet_out_buffer_id_reserved = -1;
 static int hf_openflow_v6_packet_out_in_port = -1;
-static int hf_openflow_v6_packet_out_in_port_reserved = -1;
 static int hf_openflow_v6_packet_out_acts_len = -1;
 static int hf_openflow_v6_packet_out_pad = -1;
 static int hf_openflow_v6_flowmod_cookie = -1;
 static int hf_openflow_v6_flowmod_cookie_mask = -1;
 static int hf_openflow_v6_flowmod_table_id = -1;
-static int hf_openflow_v6_flowmod_table_id_reserved = -1;
 static int hf_openflow_v6_flowmod_command = -1;
 static int hf_openflow_v6_flowmod_idle_timeout = -1;
 static int hf_openflow_v6_flowmod_hard_timeout = -1;
 static int hf_openflow_v6_flowmod_priority = -1;
 static int hf_openflow_v6_flowmod_buffer_id = -1;
-static int hf_openflow_v6_flowmod_buffer_id_reserved = -1;
 static int hf_openflow_v6_flowmod_out_port = -1;
-static int hf_openflow_v6_flowmod_out_port_reserved = -1;
 static int hf_openflow_v6_flowmod_out_group = -1;
-static int hf_openflow_v6_flowmod_out_group_reserved = -1;
 static int hf_openflow_v6_flowmod_flags = -1;
 static int hf_openflow_v6_flowmod_flags_send_flow_rem = -1;
 static int hf_openflow_v6_flowmod_flags_check_overlap = -1;
@@ -324,15 +311,12 @@ static int hf_openflow_v6_flowmod_importance = -1;
 static int hf_openflow_v6_bucket_length = -1;
 static int hf_openflow_v6_bucket_weight = -1;
 static int hf_openflow_v6_bucket_watch_port = -1;
-static int hf_openflow_v6_bucket_watch_port_reserved = -1;
 static int hf_openflow_v6_bucket_watch_group = -1;
-static int hf_openflow_v6_bucket_watch_group_reserved = -1;
 static int hf_openflow_v6_bucket_pad = -1;
 static int hf_openflow_v6_groupmod_command = -1;
 static int hf_openflow_v6_groupmod_type = -1;
 static int hf_openflow_v6_groupmod_pad = -1;
 static int hf_openflow_v6_groupmod_group_id = -1;
-static int hf_openflow_v6_groupmod_group_id_reserved = -1;
 static int hf_openflow_v6_groupmod_bucket_array_len = -1;
 static int hf_openflow_v6_groupmod_command_bucket_id = -1;
 static int hf_openflow_v6_portmod_prop_type = -1;
@@ -366,7 +350,6 @@ static int hf_openflow_v6_portmod_prop_optical_tx_pwr = -1;
 static int hf_openflow_v6_portmod_prop_experimenter_experimenter = -1;
 static int hf_openflow_v6_portmod_prop_experimenter_exp_type = -1;
 static int hf_openflow_v6_portmod_port_no = -1;
-static int hf_openflow_v6_portmod_port_no_reserved = -1;
 static int hf_openflow_v6_portmod_pad = -1;
 static int hf_openflow_v6_portmod_hw_addr = -1;
 static int hf_openflow_v6_portmod_pad2 = -1;
@@ -381,7 +364,6 @@ static int hf_openflow_v6_portmod_mask_no_recv = -1;
 static int hf_openflow_v6_portmod_mask_no_fwd = -1;
 static int hf_openflow_v6_portmod_mask_no_packet_in = -1;
 static int hf_openflow_v6_tablemod_table_id = -1;
-static int hf_openflow_v6_tablemod_table_id_reserved = -1;
 static int hf_openflow_v6_tablemod_pad = -1;
 static int hf_openflow_v6_tablemod_config = -1;
 static int hf_openflow_v6_tablemod_config_eviction = -1;
@@ -399,22 +381,16 @@ static int hf_openflow_v6_tablemod_prop_vacancy_pad = -1;
 static int hf_openflow_v6_tablemod_prop_experimenter_experimenter = -1;
 static int hf_openflow_v6_tablemod_prop_experimenter_exp_type = -1;
 static int hf_openflow_v6_flow_stats_request_table_id = -1;
-static int hf_openflow_v6_flow_stats_request_table_id_reserved = -1;
 static int hf_openflow_v6_flow_stats_request_pad = -1;
 static int hf_openflow_v6_flow_stats_request_out_port = -1;
-static int hf_openflow_v6_flow_stats_request_out_port_reserved = -1;
 static int hf_openflow_v6_flow_stats_request_out_group = -1;
-static int hf_openflow_v6_flow_stats_request_out_group_reserved = -1;
 static int hf_openflow_v6_flow_stats_request_pad2 = -1;
 static int hf_openflow_v6_flow_stats_request_cookie = -1;
 static int hf_openflow_v6_flow_stats_request_cookie_mask = -1;
 static int hf_openflow_v6_aggregate_stats_request_table_id = -1;
-static int hf_openflow_v6_aggregate_stats_request_table_id_reserved = -1;
 static int hf_openflow_v6_aggregate_stats_request_pad = -1;
 static int hf_openflow_v6_aggregate_stats_request_out_port = -1;
-static int hf_openflow_v6_aggregate_stats_request_out_port_reserved = -1;
 static int hf_openflow_v6_aggregate_stats_request_out_group = -1;
-static int hf_openflow_v6_aggregate_stats_request_out_group_reserved = -1;
 static int hf_openflow_v6_aggregate_stats_request_pad2 = -1;
 static int hf_openflow_v6_aggregate_stats_request_cookie = -1;
 static int hf_openflow_v6_aggregate_stats_request_cookie_mask = -1;
@@ -436,30 +412,20 @@ static int hf_openflow_v6_table_features_capabilities_eviction = -1;
 static int hf_openflow_v6_table_features_capabilities_vacancy_events = -1;
 static int hf_openflow_v6_table_features_max_entries = -1;
 static int hf_openflow_v6_port_stats_request_port_no = -1;
-static int hf_openflow_v6_port_stats_request_port_no_reserved = -1;
 static int hf_openflow_v6_port_stats_request_pad = -1;
 static int hf_openflow_v6_queue_stats_request_port_no = -1;
-static int hf_openflow_v6_queue_stats_request_port_no_reserved = -1;
 static int hf_openflow_v6_queue_stats_request_queue_id = -1;
-static int hf_openflow_v6_queue_stats_request_queue_id_reserved = -1;
 static int hf_openflow_v6_group_stats_request_group_id = -1;
-static int hf_openflow_v6_group_stats_request_group_id_reserved = -1;
 static int hf_openflow_v6_group_stats_request_pad = -1;
 static int hf_openflow_v6_meter_stats_request_meter_id = -1;
-static int hf_openflow_v6_meter_stats_request_meter_id_reserved = -1;
 static int hf_openflow_v6_meter_stats_request_pad = -1;
 static int hf_openflow_v6_meter_desc_request_meter_id = -1;
-static int hf_openflow_v6_meter_desc_request_meter_id_reserved = -1;
 static int hf_openflow_v6_meter_desc_request_pad = -1;
 static int hf_openflow_v6_queue_desc_request_port_no = -1;
-static int hf_openflow_v6_queue_desc_request_port_no_reserved = -1;
 static int hf_openflow_v6_queue_desc_request_queue_id = -1;
-static int hf_openflow_v6_queue_desc_request_queue_id_reserved = -1;
 static int hf_openflow_v6_flow_monitor_request_monitor_id = -1;
 static int hf_openflow_v6_flow_monitor_request_out_port = -1;
-static int hf_openflow_v6_flow_monitor_request_out_port_reserved = -1;
 static int hf_openflow_v6_flow_monitor_request_out_group = -1;
-static int hf_openflow_v6_flow_monitor_request_out_group_reserved = -1;
 static int hf_openflow_v6_flow_monitor_request_flags = -1;
 static int hf_openflow_v6_flow_monitor_request_flags_initial = -1;
 static int hf_openflow_v6_flow_monitor_request_flags_add = -1;
@@ -469,7 +435,6 @@ static int hf_openflow_v6_flow_monitor_request_flags_instructions = -1;
 static int hf_openflow_v6_flow_monitor_request_flags_no_abbrev = -1;
 static int hf_openflow_v6_flow_monitor_request_flags_only_own = -1;
 static int hf_openflow_v6_flow_monitor_request_table_id = -1;
-static int hf_openflow_v6_flow_monitor_request_table_id_reserved = -1;
 static int hf_openflow_v6_flow_monitor_request_command = -1;
 static int hf_openflow_v6_multipart_request_type = -1;
 static int hf_openflow_v6_multipart_request_flags = -1;
@@ -506,13 +471,11 @@ static int hf_openflow_v6_aggregate_stats_byte_count = -1;
 static int hf_openflow_v6_aggregate_stats_flow_count = -1;
 static int hf_openflow_v6_aggregate_stats_pad = -1;
 static int hf_openflow_v6_table_stats_table_id = -1;
-static int hf_openflow_v6_table_stats_table_id_reserved = -1;
 static int hf_openflow_v6_table_stats_pad = -1;
 static int hf_openflow_v6_table_stats_active_count = -1;
 static int hf_openflow_v6_table_stats_lookup_count = -1;
 static int hf_openflow_v6_table_stats_match_count = -1;
 static int hf_openflow_v6_port_stats_port_no = -1;
-static int hf_openflow_v6_port_stats_port_no_reserved = -1;
 static int hf_openflow_v6_port_stats_pad = -1;
 static int hf_openflow_v6_port_stats_rx_packets = -1;
 static int hf_openflow_v6_port_stats_tx_packets = -1;
@@ -531,9 +494,7 @@ static int hf_openflow_v6_port_stats_duration_nsec = -1;
 static int hf_openflow_v6_queue_stats_length = -1;
 static int hf_openflow_v6_queue_stats_pad = -1;
 static int hf_openflow_v6_queue_stats_port_no = -1;
-static int hf_openflow_v6_queue_stats_port_no_reserved = -1;
 static int hf_openflow_v6_queue_stats_queue_id = -1;
-static int hf_openflow_v6_queue_stats_queue_id_reserved = -1;
 static int hf_openflow_v6_queue_stats_tx_bytes = -1;
 static int hf_openflow_v6_queue_stats_tx_packets = -1;
 static int hf_openflow_v6_queue_stats_tx_errors = -1;
@@ -548,7 +509,6 @@ static int hf_openflow_v6_bucket_counter_byte_count = -1;
 static int hf_openflow_v6_group_stats_length = -1;
 static int hf_openflow_v6_group_stats_pad = -1;
 static int hf_openflow_v6_group_stats_group_id = -1;
-static int hf_openflow_v6_group_stats_group_id_reserved = -1;
 static int hf_openflow_v6_group_stats_ref_count = -1;
 static int hf_openflow_v6_group_stats_pad2 = -1;
 static int hf_openflow_v6_group_stats_packet_count = -1;
@@ -557,7 +517,6 @@ static int hf_openflow_v6_group_desc_length = -1;
 static int hf_openflow_v6_group_desc_type = -1;
 static int hf_openflow_v6_group_desc_pad = -1;
 static int hf_openflow_v6_group_desc_group_id = -1;
-static int hf_openflow_v6_group_desc_group_id_reserved = -1;
 static int hf_openflow_v6_group_features_types = -1;
 static int hf_openflow_v6_group_features_types_all = -1;
 static int hf_openflow_v6_group_features_types_select = -1;
@@ -651,7 +610,6 @@ static int hf_openflow_v6_group_features_actions_ff_meter = -1;
 static int hf_openflow_v6_meter_band_stats_packet_band_count = -1;
 static int hf_openflow_v6_meter_band_stats_byte_band_count = -1;
 static int hf_openflow_v6_meter_stats_meter_id = -1;
-static int hf_openflow_v6_meter_stats_meter_id_reserved = -1;
 static int hf_openflow_v6_meter_stats_len = -1;
 static int hf_openflow_v6_meter_stats_pad = -1;
 static int hf_openflow_v6_meter_stats_flow_count = -1;
@@ -666,7 +624,6 @@ static int hf_openflow_v6_meter_desc_flags_pktps = -1;
 static int hf_openflow_v6_meter_desc_flags_burst = -1;
 static int hf_openflow_v6_meter_desc_flags_stats = -1;
 static int hf_openflow_v6_meter_desc_meter_id = -1;
-static int hf_openflow_v6_meter_desc_meter_id_reserved = -1;
 static int hf_openflow_v6_meter_features_max_meter = -1;
 static int hf_openflow_v6_meter_features_band_types = -1;
 static int hf_openflow_v6_meter_features_band_types_drop = -1;
@@ -682,7 +639,6 @@ static int hf_openflow_v6_meter_features_pad = -1;
 static int hf_openflow_v6_flow_update_length = -1;
 static int hf_openflow_v6_flow_update_event = -1;
 static int hf_openflow_v6_flow_update_full_table_id = -1;
-static int hf_openflow_v6_flow_update_full_table_id_reserved = -1;
 static int hf_openflow_v6_flow_update_full_reason = -1;
 static int hf_openflow_v6_flow_update_full_zero = -1;
 static int hf_openflow_v6_flow_update_full_idle_timeout = -1;
@@ -700,25 +656,20 @@ static int hf_openflow_v6_multipart_reply_experimenter_experimenter = -1;
 static int hf_openflow_v6_multipart_reply_experimenter_exp_type = -1;
 static int hf_openflow_v6_table_desc_length = -1;
 static int hf_openflow_v6_table_desc_table_id = -1;
-static int hf_openflow_v6_table_desc_table_id_reserved = -1;
 static int hf_openflow_v6_table_desc_pad = -1;
 static int hf_openflow_v6_table_desc_config = -1;
 static int hf_openflow_v6_table_desc_config_eviction = -1;
 static int hf_openflow_v6_table_desc_config_vacancy_events = -1;
 static int hf_openflow_v6_queue_desc_port_no = -1;
-static int hf_openflow_v6_queue_desc_port_no_reserved = -1;
 static int hf_openflow_v6_queue_desc_queue_id = -1;
-static int hf_openflow_v6_queue_desc_queue_id_reserved = -1;
 static int hf_openflow_v6_queue_desc_len = -1;
 static int hf_openflow_v6_queue_desc_pad = -1;
 static int hf_openflow_v6_queue_desc_prop_property = -1;
 static int hf_openflow_v6_queue_desc_prop_len = -1;
 static int hf_openflow_v6_queue_desc_prop_pad = -1;
 static int hf_openflow_v6_queue_desc_prop_min_rate_rate = -1;
-static int hf_openflow_v6_queue_desc_prop_min_rate_rate_reserved = -1;
 static int hf_openflow_v6_queue_desc_prop_min_rate_pad = -1;
 static int hf_openflow_v6_queue_desc_prop_max_rate_rate = -1;
-static int hf_openflow_v6_queue_desc_prop_max_rate_rate_reserved = -1;
 static int hf_openflow_v6_queue_desc_prop_max_rate_pad = -1;
 static int hf_openflow_v6_queue_desc_prop_experimenter_experimenter = -1;
 static int hf_openflow_v6_queue_desc_prop_experimenter_exp_type = -1;
@@ -767,7 +718,6 @@ static int hf_openflow_v6_metermod_flags_pktps = -1;
 static int hf_openflow_v6_metermod_flags_burst = -1;
 static int hf_openflow_v6_metermod_flags_stats = -1;
 static int hf_openflow_v6_metermod_meter_id = -1;
-static int hf_openflow_v6_metermod_meter_id_reserved = -1;
 static int hf_openflow_v6_role_status_role = -1;
 static int hf_openflow_v6_role_status_reason = -1;
 static int hf_openflow_v6_role_status_pad = -1;
@@ -2050,11 +2000,7 @@ dissect_openflow_switch_config_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t
     offset+=2;
 
     /* uint16_t miss_send_len; */
-    if (tvb_get_ntohs(tvb, offset) <= OFPCML_MAX) {
-        proto_tree_add_item(tree, hf_openflow_v6_switch_config_miss_send_len, tvb, offset, 2, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_switch_config_miss_send_len_reserved, tvb, offset, 2, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_switch_config_miss_send_len, tvb, offset, 2, ENC_BIG_ENDIAN);
     /*offset+=2;*/
 }
 
@@ -2084,11 +2030,7 @@ dissect_openflow_packet_in_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
     address save_dl_src, save_dl_dst, save_net_src, save_net_dst, save_src, save_dst;
 
     /* uint32_t buffer_id; */
-    if (tvb_get_ntohl(tvb, offset) != OFP_NO_BUFFER) {
-        proto_tree_add_item(tree, hf_openflow_v6_packet_in_buffer_id, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_packet_in_buffer_id_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_packet_in_buffer_id, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint16_t total_len; */
@@ -2297,19 +2239,11 @@ dissect_openflow_action_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
     switch (act_type) {
     case OFPAT_OUTPUT:
         /* uint32_t port; */
-        if (tvb_get_ntohl(tvb, offset) <= OFPP_MAX) {
-            proto_tree_add_item(act_tree, hf_openflow_v6_action_output_port, tvb, offset, 4, ENC_BIG_ENDIAN);
-        } else {
-            proto_tree_add_item(act_tree, hf_openflow_v6_action_output_port_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-        }
+        proto_tree_add_item(act_tree, hf_openflow_v6_action_output_port, tvb, offset, 4, ENC_BIG_ENDIAN);
         offset+=4;
 
         /* uint16_t max_len; */
-        if (tvb_get_ntohs(tvb, offset) <= OFPCML_MAX) {
-            proto_tree_add_item(act_tree, hf_openflow_v6_action_output_max_len, tvb, offset, 2, ENC_BIG_ENDIAN);
-        } else {
-            proto_tree_add_item(act_tree, hf_openflow_v6_action_output_max_len_reserved, tvb, offset, 2, ENC_BIG_ENDIAN);
-        }
+        proto_tree_add_item(act_tree, hf_openflow_v6_action_output_max_len, tvb, offset, 2, ENC_BIG_ENDIAN);
         offset+=2;
 
         /* uint8_t pad[6]; */
@@ -2390,11 +2324,7 @@ dissect_openflow_action_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
 
     case OFPAT_GROUP:
         /* uint32_t group_id; */
-        if (tvb_get_ntohl(tvb, offset) <= OFPG_MAX) {
-            proto_tree_add_item(act_tree, hf_openflow_v6_action_group_group_id, tvb, offset, 4, ENC_BIG_ENDIAN);
-        } else {
-            proto_tree_add_item(act_tree, hf_openflow_v6_action_group_group_id_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-        }
+        proto_tree_add_item(act_tree, hf_openflow_v6_action_group_group_id, tvb, offset, 4, ENC_BIG_ENDIAN);
         offset+=4;
         break;
 
@@ -2753,11 +2683,7 @@ dissect_openflow_port_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree
     port_tree = proto_tree_add_subtree(tree, tvb, offset, 64, ett_openflow_v6_port, NULL, "Port");
 
     /* uint32_t port_no; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPP_MAX) {
-        proto_tree_add_item(port_tree, hf_openflow_v6_port_port_no, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(port_tree, hf_openflow_v6_port_port_no_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(port_tree, hf_openflow_v6_port_port_no, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint16_t length; */
@@ -2848,19 +2774,11 @@ dissect_openflow_packet_out_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
     address save_dl_src, save_dl_dst, save_net_src, save_net_dst, save_src, save_dst;
 
     /* uint32_t buffer_id; */
-    if (tvb_get_ntohl(tvb, offset) != OFP_NO_BUFFER) {
-        proto_tree_add_item(tree, hf_openflow_v6_packet_out_buffer_id, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_packet_out_buffer_id_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_packet_out_buffer_id, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint32_t in_port; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPP_MAX) {
-        proto_tree_add_item(tree, hf_openflow_v6_packet_out_in_port, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_packet_out_in_port_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_packet_out_in_port, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint16_t actions_len; */
@@ -3015,11 +2933,7 @@ dissect_openflow_instruction_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
 
     case OFPIT_METER:
         /* uint32_t meter_id; */
-        if (tvb_get_ntohl(tvb, offset) <= OFPM_MAX) {
-            proto_tree_add_item(inst_tree, hf_openflow_v6_instruction_meter_meter_id, tvb, offset, 4, ENC_BIG_ENDIAN);
-        } else {
-            proto_tree_add_item(inst_tree, hf_openflow_v6_instruction_meter_meter_id_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-        }
+        proto_tree_add_item(inst_tree, hf_openflow_v6_instruction_meter_meter_id, tvb, offset, 4, ENC_BIG_ENDIAN);
         offset+=4;
         break;
 
@@ -3070,11 +2984,7 @@ dissect_openflow_flowmod_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
     offset+=8;
 
     /* uint8_t table_id; */
-    if (tvb_get_guint8(tvb, offset) <= OFPTT_MAX) {
-        proto_tree_add_item(tree, hf_openflow_v6_flowmod_table_id, tvb, offset, 1, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_flowmod_table_id_reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_flowmod_table_id, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset+=1;
 
     /* uint8_t command; */
@@ -3094,27 +3004,15 @@ dissect_openflow_flowmod_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
     offset+=2;
 
     /* uint32_t buffer_id; */
-    if (tvb_get_ntohl(tvb, offset) != OFP_NO_BUFFER) {
-        proto_tree_add_item(tree, hf_openflow_v6_flowmod_buffer_id, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_flowmod_buffer_id_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_flowmod_buffer_id, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint32_t out_port; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPP_MAX) {
-        proto_tree_add_item(tree, hf_openflow_v6_flowmod_out_port, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_flowmod_out_port_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_flowmod_out_port, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint32_t out_group; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPG_MAX) {
-        proto_tree_add_item(tree, hf_openflow_v6_flowmod_out_group, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_flowmod_out_group_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_flowmod_out_group, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint16_t flags; */
@@ -3166,19 +3064,11 @@ dissect_openflow_bucket_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
     offset+=2;
 
     /* uint32_t watch_port; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPP_MAX) {
-        proto_tree_add_item(bucket_tree, hf_openflow_v6_bucket_watch_port, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(bucket_tree, hf_openflow_v6_bucket_watch_port_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(bucket_tree, hf_openflow_v6_bucket_watch_port, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint32_t watch_group; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPG_MAX) {
-        proto_tree_add_item(bucket_tree, hf_openflow_v6_bucket_watch_group, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(bucket_tree, hf_openflow_v6_bucket_watch_group_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(bucket_tree, hf_openflow_v6_bucket_watch_group, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint8_t pad[4]; */
@@ -3232,11 +3122,7 @@ dissect_openflow_groupmod_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
     offset+=1;
 
     /* uint32_t group_id; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPG_MAX) {
-        proto_tree_add_item(tree, hf_openflow_v6_groupmod_group_id, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_groupmod_group_id_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_groupmod_group_id, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint16_t bucket_array_len; */
@@ -3399,11 +3285,7 @@ dissect_openflow_portmod_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
     proto_tree *conf_tree, *mask_tree;
 
     /* uint32_t port_no; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPP_MAX) {
-        proto_tree_add_item(tree, hf_openflow_v6_portmod_port_no, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_portmod_port_no_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_portmod_port_no, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint8_t pad[4]; */
@@ -3545,11 +3427,7 @@ dissect_openflow_tablemod_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
     int save_offset;
 
     /* uint8_t table_id; */
-    if (tvb_get_guint8(tvb, offset) <= OFPTT_MAX) {
-        proto_tree_add_item(tree, hf_openflow_v6_tablemod_table_id, tvb, offset, 1, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_tablemod_table_id_reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_tablemod_table_id, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset+=1;
 
     /* uint8_t pad[3]; */
@@ -3580,11 +3458,7 @@ static void
 dissect_openflow_flow_stats_request_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, guint16 length)
 {
     /* uint8_t table_id; */
-    if (tvb_get_guint8(tvb, offset) <= OFPTT_MAX) {
-        proto_tree_add_item(tree, hf_openflow_v6_flow_stats_request_table_id, tvb, offset, 1, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_flow_stats_request_table_id_reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_flow_stats_request_table_id, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset+=1;
 
     /* uint8_t pad[3]; */
@@ -3592,19 +3466,11 @@ dissect_openflow_flow_stats_request_v6(tvbuff_t *tvb, packet_info *pinfo _U_, pr
     offset+=3;
 
     /* uint32_t out_port; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPP_MAX) {
-        proto_tree_add_item(tree, hf_openflow_v6_flow_stats_request_out_port, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_flow_stats_request_out_port_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_flow_stats_request_out_port, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint32_t out_group; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPG_MAX) {
-        proto_tree_add_item(tree, hf_openflow_v6_flow_stats_request_out_group, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_flow_stats_request_out_group_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_flow_stats_request_out_group, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint8_t pad2[4]; */
@@ -3627,11 +3493,7 @@ static void
 dissect_openflow_aggregate_stats_request_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, guint16 length)
 {
     /* uint8_t table_id; */
-    if (tvb_get_guint8(tvb, offset) <= OFPTT_MAX) {
-        proto_tree_add_item(tree, hf_openflow_v6_aggregate_stats_request_table_id, tvb, offset, 1, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_aggregate_stats_request_table_id_reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_aggregate_stats_request_table_id, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset+=1;
 
     /* uint8_t pad[3]; */
@@ -3639,19 +3501,11 @@ dissect_openflow_aggregate_stats_request_v6(tvbuff_t *tvb, packet_info *pinfo _U
     offset+=3;
 
     /* uint32_t out_port; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPP_MAX) {
-        proto_tree_add_item(tree, hf_openflow_v6_aggregate_stats_request_out_port, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_aggregate_stats_request_out_port_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_aggregate_stats_request_out_port, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint32_t out_group; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPG_MAX) {
-        proto_tree_add_item(tree, hf_openflow_v6_aggregate_stats_request_out_group, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_aggregate_stats_request_out_group_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_aggregate_stats_request_out_group, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint8_t pad2[4]; */
@@ -3892,11 +3746,7 @@ static void
 dissect_openflow_port_stats_request_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, guint16 length _U_)
 {
     /* uint32_t port_no; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPP_MAX) {
-        proto_tree_add_item(tree, hf_openflow_v6_port_stats_request_port_no, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_port_stats_request_port_no_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_port_stats_request_port_no, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint8_t pad[4]; */
@@ -3914,19 +3764,11 @@ static void
 dissect_openflow_queue_stats_request_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, guint16 length _U_)
 {
     /* uint32_t port_no; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPP_MAX) {
-        proto_tree_add_item(tree, hf_openflow_v6_queue_stats_request_port_no, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_queue_stats_request_port_no_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_queue_stats_request_port_no, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint32_t queue_id; */
-    if (tvb_get_ntohl(tvb, offset) != OFPQ_ALL) {
-        proto_tree_add_item(tree, hf_openflow_v6_queue_stats_request_queue_id, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_queue_stats_request_queue_id_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_queue_stats_request_queue_id, tvb, offset, 4, ENC_BIG_ENDIAN);
     /*offset+=4;*/
 }
 
@@ -3935,11 +3777,7 @@ static void
 dissect_openflow_group_stats_request_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, guint16 length _U_)
 {
     /* uint32_t group_id; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPG_MAX) {
-        proto_tree_add_item(tree, hf_openflow_v6_group_stats_request_group_id, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_group_stats_request_group_id_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_group_stats_request_group_id, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint8_t pad[4]; */
@@ -3952,11 +3790,7 @@ static void
 dissect_openflow_meter_stats_request_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, guint16 length _U_)
 {
     /* uint32_t meter_id; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPM_MAX) {
-        proto_tree_add_item(tree, hf_openflow_v6_meter_stats_request_meter_id, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_meter_stats_request_meter_id_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_meter_stats_request_meter_id, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint8_t pad[4]; */
@@ -3969,11 +3803,7 @@ static void
 dissect_openflow_meter_desc_request_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, guint16 length _U_)
 {
     /* uint32_t meter_id; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPM_MAX) {
-        proto_tree_add_item(tree, hf_openflow_v6_meter_desc_request_meter_id, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_meter_desc_request_meter_id_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_meter_desc_request_meter_id, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint8_t pad[4]; */
@@ -3987,19 +3817,11 @@ static void
 dissect_openflow_queue_desc_request_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, guint16 length _U_)
 {
     /* uint32_t port_no; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPP_MAX) {
-        proto_tree_add_item(tree, hf_openflow_v6_queue_desc_request_port_no, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_queue_desc_request_port_no_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_queue_desc_request_port_no, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint32_t queue_id; */
-    if (tvb_get_ntohl(tvb, offset) != OFPQ_ALL) {
-        proto_tree_add_item(tree, hf_openflow_v6_queue_desc_request_queue_id, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_queue_desc_request_queue_id_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_queue_desc_request_queue_id, tvb, offset, 4, ENC_BIG_ENDIAN);
     /*offset+=4;*/
 }
 
@@ -4033,19 +3855,12 @@ dissect_openflow_flow_monitor_request_v6(tvbuff_t *tvb, packet_info *pinfo _U_,
     offset+=4;
 
     /* uint32_t out_port; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPP_MAX) {
-        proto_tree_add_item(tree, hf_openflow_v6_flow_monitor_request_out_port, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_flow_monitor_request_out_port_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_flow_monitor_request_out_port, tvb, offset, 4, ENC_BIG_ENDIAN);
+
     offset+=4;
 
     /* uint32_t out_group; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPG_MAX) {
-        proto_tree_add_item(tree, hf_openflow_v6_flow_monitor_request_out_group, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_flow_monitor_request_out_group_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_flow_monitor_request_out_group, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint16_t flags; */
@@ -4062,11 +3877,7 @@ dissect_openflow_flow_monitor_request_v6(tvbuff_t *tvb, packet_info *pinfo _U_,
     offset+=2;
 
     /* uint8_t table_id; */
-    if (tvb_get_guint8(tvb, offset) <= OFPTT_MAX) {
-        proto_tree_add_item(tree, hf_openflow_v6_flow_monitor_request_table_id, tvb, offset, 1, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_flow_monitor_request_table_id_reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_flow_monitor_request_table_id, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset+=1;
 
     /* uint8_t command; */
@@ -4363,11 +4174,7 @@ dissect_openflow_table_stats_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
     stats_tree = proto_tree_add_subtree(tree, tvb, offset, 24, ett_openflow_v6_table_stats, NULL, "Table stats");
 
     /* uint8_t table_id; */
-    if (tvb_get_guint8(tvb, offset) <= OFPTT_MAX) {
-        proto_tree_add_item(stats_tree, hf_openflow_v6_table_stats_table_id, tvb, offset, 1, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(stats_tree, hf_openflow_v6_table_stats_table_id_reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(stats_tree, hf_openflow_v6_table_stats_table_id, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset+=1;
 
     /* uint8_t pad[3]; */
@@ -4398,11 +4205,7 @@ dissect_openflow_port_stats_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
     stats_tree = proto_tree_add_subtree(tree, tvb, offset, 112, ett_openflow_v6_port_stats, NULL, "Port stats");
 
     /* uint8_t port_no; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPP_MAX) {
-        proto_tree_add_item(stats_tree, hf_openflow_v6_port_stats_port_no, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(stats_tree, hf_openflow_v6_port_stats_port_no_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(stats_tree, hf_openflow_v6_port_stats_port_no, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint8_t pad[4]; */
@@ -4488,11 +4291,7 @@ dissect_openflow_table_desc_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
     offset+=2;
 
     /* uint8_t table_id; */
-    if (tvb_get_guint8(tvb, offset) <= OFPTT_MAX) {
-        proto_tree_add_item(desc_tree, hf_openflow_v6_table_desc_table_id, tvb, offset, 1, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(desc_tree, hf_openflow_v6_table_desc_table_id_reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(desc_tree, hf_openflow_v6_table_desc_table_id, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset+=1;
 
     /* uint8_t pad[1]; */
@@ -4592,19 +4391,11 @@ dissect_openflow_queue_stats_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
     offset+=2;
 
     /* uint32_t port_no; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPP_MAX) {
-        proto_tree_add_item(stats_tree, hf_openflow_v6_queue_stats_port_no, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(stats_tree, hf_openflow_v6_queue_stats_port_no_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(stats_tree, hf_openflow_v6_queue_stats_port_no, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint32_t queue_id; */
-    if (tvb_get_ntohl(tvb, offset) != OFPQ_ALL) {
-        proto_tree_add_item(stats_tree, hf_openflow_v6_queue_stats_queue_id, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(stats_tree, hf_openflow_v6_queue_stats_queue_id_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(stats_tree, hf_openflow_v6_queue_stats_queue_id, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint64_t tx_bytes; */
@@ -4678,11 +4469,7 @@ dissect_openflow_group_stats_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
     offset+=2;
 
     /* uint32_t group_id; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPG_MAX) {
-        proto_tree_add_item(stats_tree, hf_openflow_v6_group_stats_group_id, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(stats_tree, hf_openflow_v6_group_stats_group_id_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(stats_tree, hf_openflow_v6_group_stats_group_id, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint32_t ref_count; */
@@ -4744,11 +4531,7 @@ dissect_openflow_group_desc_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
     offset+=1;
 
     /* uint32_t group_id; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPG_MAX) {
-        proto_tree_add_item(desc_tree, hf_openflow_v6_group_desc_group_id, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(desc_tree, hf_openflow_v6_group_desc_group_id_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(desc_tree, hf_openflow_v6_group_desc_group_id, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* struct ofp_bucket buckets[0]; */
@@ -4925,11 +4708,7 @@ dissect_openflow_meter_stats_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
     stats_tree = proto_tree_add_subtree(tree, tvb, offset, -1, ett_openflow_v6_meter_stats, &ti, "Meter stats");
 
     /* uint32_t meter_id; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPM_MAX) {
-        proto_tree_add_item(stats_tree, hf_openflow_v6_meter_stats_meter_id, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(stats_tree, hf_openflow_v6_meter_stats_meter_id_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(stats_tree, hf_openflow_v6_meter_stats_meter_id, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint16_t len; */
@@ -5000,11 +4779,7 @@ dissect_openflow_meter_desc_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
     offset+=2;
 
     /* uint32_t meter_id; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPM_MAX) {
-        proto_tree_add_item(conf_tree, hf_openflow_v6_meter_desc_meter_id, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(conf_tree, hf_openflow_v6_meter_desc_meter_id_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(conf_tree, hf_openflow_v6_meter_desc_meter_id, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* struct ofp_meter_band_header bands[0]; */
@@ -5118,11 +4893,7 @@ dissect_openflow_queue_desc_prop_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto
     switch (prop_type) {
     case OFPQDPT_MIN_RATE:
         /* uint16_t rate; */
-        if (tvb_get_ntohs(tvb, offset) <= OFPQDP_MIN_RATE_MAX) {
-            proto_tree_add_item(prop_tree, hf_openflow_v6_queue_desc_prop_min_rate_rate, tvb, offset, 2, ENC_BIG_ENDIAN);
-        } else {
-            proto_tree_add_item(prop_tree, hf_openflow_v6_queue_desc_prop_min_rate_rate_reserved, tvb, offset, 2, ENC_BIG_ENDIAN);
-        }
+        proto_tree_add_item(prop_tree, hf_openflow_v6_queue_desc_prop_min_rate_rate, tvb, offset, 2, ENC_BIG_ENDIAN);
         offset+=2;
 
         /* uint8_t pad[6]; */
@@ -5132,11 +4903,7 @@ dissect_openflow_queue_desc_prop_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto
 
     case OFPQDPT_MAX_RATE:
         /* uint16_t rate; */
-        if (tvb_get_ntohs(tvb, offset) <= OFPQDP_MAX_RATE_MAX) {
-            proto_tree_add_item(prop_tree, hf_openflow_v6_queue_desc_prop_max_rate_rate, tvb, offset, 2, ENC_BIG_ENDIAN);
-        } else {
-            proto_tree_add_item(prop_tree, hf_openflow_v6_queue_desc_prop_max_rate_rate_reserved, tvb, offset, 2, ENC_BIG_ENDIAN);
-        }
+        proto_tree_add_item(prop_tree, hf_openflow_v6_queue_desc_prop_max_rate_rate, tvb, offset, 2, ENC_BIG_ENDIAN);
         offset+=2;
 
         /* uint8_t pad[6]; */
@@ -5192,19 +4959,11 @@ dissect_openflow_queue_desc_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
     desc_tree = proto_tree_add_subtree(tree, tvb, offset, desc_len, ett_openflow_v6_queue_desc, NULL, "Queue desc");
 
     /* uint32_t port_no; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPP_MAX) {
-        proto_tree_add_item(tree, hf_openflow_v6_queue_desc_port_no, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_queue_desc_port_no_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_queue_desc_port_no, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint32_t queue_id; */
-    if (tvb_get_ntohl(tvb, offset) != OFPQ_ALL) {
-        proto_tree_add_item(desc_tree, hf_openflow_v6_queue_desc_queue_id, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(desc_tree, hf_openflow_v6_queue_desc_queue_id_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(desc_tree, hf_openflow_v6_queue_desc_queue_id, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint16_t len; */
@@ -5275,11 +5034,7 @@ dissect_openflow_flow_update_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
     case OFPFME_REMOVED:
     case OFPFME_MODIFIED:
         /* uint8_t table_id; */
-        if (tvb_get_guint8(tvb, offset) <= OFPTT_MAX) {
-            proto_tree_add_item(update_tree, hf_openflow_v6_flow_update_full_table_id, tvb, offset, 1, ENC_BIG_ENDIAN);
-        } else {
-            proto_tree_add_item(update_tree, hf_openflow_v6_flow_update_full_table_id_reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
-        }
+        proto_tree_add_item(update_tree, hf_openflow_v6_flow_update_full_table_id, tvb, offset, 1, ENC_BIG_ENDIAN);
         offset+=1;
 
         if (update_event == OFPFME_REMOVED) {
@@ -5475,11 +5230,7 @@ static void
 dissect_openflow_queue_get_config_request_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, guint16 length _U_)
 {
     /* uint32_t port; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPP_MAX) {
-        proto_tree_add_item(tree, hf_openflow_v6_queue_get_config_request_port, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_queue_get_config_request_port_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_queue_get_config_request_port, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* uint8_t pad[4]; */
@@ -5731,11 +5482,7 @@ dissect_openflow_metermod_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
     offset+=2;
 
     /* uint32_t meter_id; */
-    if (tvb_get_ntohl(tvb, offset) <= OFPM_MAX) {
-        proto_tree_add_item(tree, hf_openflow_v6_metermod_meter_id, tvb, offset, 4, ENC_BIG_ENDIAN);
-    } else {
-        proto_tree_add_item(tree, hf_openflow_v6_metermod_meter_id_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
-    }
+    proto_tree_add_item(tree, hf_openflow_v6_metermod_meter_id, tvb, offset, 4, ENC_BIG_ENDIAN);
     offset+=4;
 
     /* struct ofp_meter_band_header bands[0]; */
@@ -6274,22 +6021,12 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_action_output_port,
             { "Port", "openflow_v6.action.output.port",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_action_output_port_reserved,
-            { "Port", "openflow_v6.action.output.port",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_port_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_port_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_action_output_max_len,
             { "Max length", "openflow_v6.action.output.max_len",
-               FT_UINT16, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_action_output_max_len_reserved,
-            { "Max length", "openflow_v6.action.output.max_len",
-               FT_UINT16, BASE_HEX, VALS(openflow_v6_controller_max_len_reserved_values), 0x0,
+               FT_UINT16, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_controller_max_len_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_action_output_pad,
@@ -6364,12 +6101,7 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_action_group_group_id,
             { "Group ID", "openflow_v6.action.group.group_id",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_action_group_group_id_reserved,
-            { "Group ID", "openflow_v6.action.group.group_id",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_port_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_port_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_action_set_nw_ttl_ttl,
@@ -6479,12 +6211,7 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_instruction_meter_meter_id,
             { "Meter ID", "openflow_v6.instruction.meter.meter_id",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_instruction_meter_meter_id_reserved,
-            { "Meter ID", "openflow_v6.instruction.meter.meter_id",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_meter_id_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_meter_id_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_port_desc_prop_type,
@@ -6934,12 +6661,7 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_port_port_no,
             { "Port no", "openflow_v6.port.port_no",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_port_port_no_reserved,
-            { "Port no", "openflow_v6.port.port_no",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_port_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_port_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_port_pad,
@@ -7284,22 +7006,12 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_switch_config_miss_send_len,
             { "Miss send length", "openflow_v6.switch_config.miss_send_len",
-               FT_UINT16, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_switch_config_miss_send_len_reserved,
-            { "Miss send length", "openflow_v6.switch_config.miss_send_len",
-               FT_UINT16, BASE_HEX, VALS(openflow_v6_controller_max_len_reserved_values), 0x0,
+               FT_UINT16, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_controller_max_len_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_packet_in_buffer_id,
             { "Buffer ID", "openflow_v6.packet_in.buffer_id",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_packet_in_buffer_id_reserved,
-            { "Buffer ID", "openflow_v6.packet_in.buffer_id",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_buffer_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_buffer_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_packet_in_total_len,
@@ -7389,22 +7101,12 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_packet_out_buffer_id,
             { "Buffer ID", "openflow_v6.packet_out.buffer_id",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_packet_out_buffer_id_reserved,
-            { "Buffer ID", "openflow_v6.packet_out.buffer_id",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_buffer_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_buffer_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_packet_out_in_port,
             { "In port", "openflow_v6.packet_out.in_port",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_packet_out_in_port_reserved,
-            { "In port", "openflow_v6.packet_out.in_port",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_port_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_port_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_packet_out_acts_len,
@@ -7429,12 +7131,7 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_flowmod_table_id,
             { "Table ID", "openflow_v6.flowmod.table_id",
-               FT_UINT8, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_flowmod_table_id_reserved,
-            { "Table ID", "openflow_v6.flowmod.table_id",
-               FT_UINT8, BASE_DEC, VALS(openflow_v6_table_reserved_values), 0x0,
+               FT_UINT8, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_table_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_flowmod_command,
@@ -7459,32 +7156,17 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_flowmod_buffer_id,
             { "Buffer ID", "openflow_v6.flowmod.buffer_id",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_flowmod_buffer_id_reserved,
-            { "Buffer ID", "openflow_v6.flowmod.buffer_id",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_buffer_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_buffer_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_flowmod_out_port,
             { "Out port", "openflow_v6.flowmod.out_port",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_flowmod_out_port_reserved,
-            { "Out port", "openflow_v6.flowmod.out_port",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_port_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_port_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_flowmod_out_group,
             { "Out group", "openflow_v6.flowmod.out_group",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_flowmod_out_group_reserved,
-            { "Out group", "openflow_v6.flowmod.out_group",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_group_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_group_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_flowmod_flags,
@@ -7534,22 +7216,12 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_bucket_watch_port,
             { "Watch port", "openflow_v6.bucket.watch_port",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_bucket_watch_port_reserved,
-            { "Watch port", "openflow_v6.bucket.watch_port",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_port_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_port_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_bucket_watch_group,
             { "Watch group", "openflow_v6.bucket.watch_group",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_bucket_watch_group_reserved,
-            { "Watch group", "openflow_v6.bucket.watch_group",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_group_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_group_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_bucket_pad,
@@ -7574,12 +7246,7 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_groupmod_group_id,
             { "Group ID", "openflow_v6.groupmod.group_id",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_groupmod_group_id_reserved,
-            { "Group ID", "openflow_v6.groupmod.group_id",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_group_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_group_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_groupmod_bucket_array_len,
@@ -7744,12 +7411,7 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_portmod_port_no,
             { "Port no", "openflow_v6.portmod.port_no",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_portmod_port_no_reserved,
-            { "Port no", "openflow_v6.portmod.port_no",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_port_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_port_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_portmod_pad,
@@ -7819,12 +7481,7 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_tablemod_table_id,
             { "Table ID", "openflow_v6.tablemod.table_id",
-               FT_UINT8, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_tablemod_table_id_reserved,
-            { "Table ID", "openflow_v6.tablemod.table_id",
-               FT_UINT8, BASE_DEC, VALS(openflow_v6_table_reserved_values), 0x0,
+               FT_UINT8, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_table_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_tablemod_pad,
@@ -7909,12 +7566,7 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_flow_stats_request_table_id,
             { "Table ID", "openflow_v6.flow_stats_request.table_id",
-               FT_UINT8, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_flow_stats_request_table_id_reserved,
-            { "Table ID", "openflow_v6.flow_stats_request.table_id",
-               FT_UINT8, BASE_DEC, VALS(openflow_v6_table_reserved_values), 0x0,
+               FT_UINT8, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_table_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_flow_stats_request_pad,
@@ -7924,22 +7576,12 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_flow_stats_request_out_port,
             { "Out port", "openflow_v6.flow_stats_request.out_port",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_flow_stats_request_out_port_reserved,
-            { "Out port", "openflow_v6.flow_stats_request.out_port",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_port_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_port_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_flow_stats_request_out_group,
             { "Out group", "openflow_v6.flow_stats_request.out_group",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_flow_stats_request_out_group_reserved,
-            { "Out group", "openflow_v6.flow_stats_request.out_group",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_group_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_group_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_flow_stats_request_pad2,
@@ -7959,12 +7601,7 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_aggregate_stats_request_table_id,
             { "Table ID", "openflow_v6.aggregate_stats_request.table_id",
-               FT_UINT8, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_aggregate_stats_request_table_id_reserved,
-            { "Table ID", "openflow_v6.aggregate_stats_request.table_id",
-               FT_UINT8, BASE_DEC, VALS(openflow_v6_table_reserved_values), 0x0,
+               FT_UINT8, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_table_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_aggregate_stats_request_pad,
@@ -7974,22 +7611,12 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_aggregate_stats_request_out_port,
             { "Out port", "openflow_v6.aggregate_stats_request.out_port",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_aggregate_stats_request_out_port_reserved,
-            { "Out port", "openflow_v6.aggregate_stats_request.out_port",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_port_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_port_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_aggregate_stats_request_out_group,
             { "Out group", "openflow_v6.aggregate_stats_request.out_group",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_aggregate_stats_request_out_group_reserved,
-            { "Out group", "openflow_v6.aggregate_stats_request.out_group",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_group_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_group_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_aggregate_stats_request_pad2,
@@ -8094,12 +7721,7 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_port_stats_request_port_no,
             { "Port number", "openflow_v6.port_stats_request.port_no",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_port_stats_request_port_no_reserved,
-            { "Port number", "openflow_v6.port_stats_request.port_no",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_port_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_port_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_port_stats_request_pad,
@@ -8109,32 +7731,17 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_queue_stats_request_port_no,
             { "Port number", "openflow_v6.queue_stats_request.port_no",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_queue_stats_request_port_no_reserved,
-            { "Port number", "openflow_v6.queue_stats_request.port_no",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_port_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_port_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_queue_stats_request_queue_id,
             { "Queue ID", "openflow_v6.queue_stats_request.queue_id",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_queue_stats_request_queue_id_reserved,
-            { "Queue ID", "openflow_v6.queue_stats_request.queue_id",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_queue_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_queue_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_group_stats_request_group_id,
             { "Group ID", "openflow_v6.group_stats_request.group_id",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_group_stats_request_group_id_reserved,
-            { "Group ID", "openflow_v6.group_stats_request.group_id",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_group_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_group_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_group_stats_request_pad,
@@ -8144,12 +7751,7 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_meter_stats_request_meter_id,
             { "Meter ID", "openflow_v6.meter_stats_request.meter_id",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_meter_stats_request_meter_id_reserved,
-            { "Meter ID", "openflow_v6.meter_stats_request.meter_id",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_meter_id_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_meter_id_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_meter_stats_request_pad,
@@ -8159,12 +7761,7 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_meter_desc_request_meter_id,
             { "Meter ID", "openflow_v6.meter_desc_request.meter_id",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_meter_desc_request_meter_id_reserved,
-            { "Meter ID", "openflow_v6.meter_desc_request.meter_id",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_meter_id_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_meter_id_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_meter_desc_request_pad,
@@ -8174,22 +7771,12 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_queue_desc_request_port_no,
             { "Port number", "openflow_v6.queue_desc_request.port_no",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_queue_desc_request_port_no_reserved,
-            { "Port number", "openflow_v6.queue_desc_request.port_no",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_port_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_port_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_queue_desc_request_queue_id,
             { "Queue ID", "openflow_v6.queue_desc_request.queue_id",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_queue_desc_request_queue_id_reserved,
-            { "Queue ID", "openflow_v6.queue_desc_request.queue_id",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_queue_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_queue_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_flow_monitor_request_monitor_id,
@@ -8199,22 +7786,12 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_flow_monitor_request_out_port,
             { "Out port", "openflow_v6.flow_monitor_request.out_port",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_flow_monitor_request_out_port_reserved,
-            { "Out port", "openflow_v6.flow_monitor_request.out_port",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_port_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_port_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_flow_monitor_request_out_group,
             { "Out group", "openflow_v6.flow_monitor_request.out_group",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_flow_monitor_request_out_group_reserved,
-            { "Out group", "openflow_v6.flow_monitor_request.out_group",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_group_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_group_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_flow_monitor_request_flags,
@@ -8259,12 +7836,7 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_flow_monitor_request_table_id,
             { "Table ID", "openflow_v6.flow_monitor_request.table_id",
-               FT_UINT8, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_flow_monitor_request_table_id_reserved,
-            { "Table ID", "openflow_v6.flow_monitor_request.table_id",
-               FT_UINT8, BASE_DEC, VALS(openflow_v6_table_reserved_values), 0x0,
+               FT_UINT8, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_table_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_flow_monitor_request_command,
@@ -8444,12 +8016,7 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_table_stats_table_id,
             { "Table ID", "openflow_v6.table_stats.table_id",
-               FT_UINT8, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_table_stats_table_id_reserved,
-            { "Table ID", "openflow_v6.table_stats.table_id",
-               FT_UINT8, BASE_DEC, VALS(openflow_v6_table_reserved_values), 0x0,
+               FT_UINT8, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_table_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_table_stats_pad,
@@ -8474,12 +8041,7 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_port_stats_port_no,
             { "Port number", "openflow_v6.port_stats.port_no",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_port_stats_port_no_reserved,
-            { "Port number", "openflow_v6.port_stats.port_no",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_port_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_port_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_port_stats_pad,
@@ -8569,22 +8131,12 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_queue_stats_port_no,
             { "Port number", "openflow_v6.queue_stats.port_no",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_queue_stats_port_no_reserved,
-            { "Port number", "openflow_v6.queue_stats.port_no",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_port_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_port_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_queue_stats_queue_id,
             { "Queue ID", "openflow_v6.queue_stats.queue_id",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_queue_stats_queue_id_reserved,
-            { "Queue ID", "openflow_v6.queue_stats.queue_id",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_queue_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_queue_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_queue_stats_tx_bytes,
@@ -8654,12 +8206,7 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_group_stats_group_id,
             { "Group ID", "openflow_v6.group_stats.group_id",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_group_stats_group_id_reserved,
-            { "Group ID", "openflow_v6.group_stats.group_id",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_group_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_group_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_group_stats_ref_count,
@@ -8699,12 +8246,7 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_group_desc_group_id,
             { "Group ID", "openflow_v6.group_desc.group_id",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_group_desc_group_id_reserved,
-            { "Group ID", "openflow_v6.group_desc.group_id",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_group_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_group_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_group_features_types,
@@ -9169,12 +8711,7 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_meter_stats_meter_id,
             { "Meter ID", "openflow_v6.meter_stats.meter_id",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_meter_stats_meter_id_reserved,
-            { "Meter ID", "openflow_v6.meter_stats.meter_id",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_meter_id_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_meter_id_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_meter_stats_len,
@@ -9244,12 +8781,7 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_meter_desc_meter_id,
             { "Meter ID", "openflow_v6.meter_desc.meter_id",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_meter_desc_meter_id_reserved,
-            { "Meter ID", "openflow_v6.meter_desc.meter_id",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_meter_id_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_meter_id_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_meter_features_max_meter,
@@ -9324,12 +8856,7 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_flow_update_full_table_id,
             { "Table ID", "openflow_v6.flow_update.full.table_id",
-               FT_UINT8, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_flow_update_full_table_id_reserved,
-            { "Table ID", "openflow_v6.flow_update.full.table_id",
-               FT_UINT8, BASE_DEC, VALS(openflow_v6_table_reserved_values), 0x0,
+               FT_UINT8, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_table_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_flow_update_full_reason,
@@ -9414,12 +8941,7 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_table_desc_table_id,
             { "Table ID", "openflow_v6.table_desc.table_id",
-               FT_UINT8, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_table_desc_table_id_reserved,
-            { "Table ID", "openflow_v6.table_desc.table_id",
-               FT_UINT8, BASE_DEC, VALS(openflow_v6_table_reserved_values), 0x0,
+               FT_UINT8, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_table_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_table_desc_pad,
@@ -9444,22 +8966,12 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_queue_desc_port_no,
             { "Port", "openflow_v6.queue_desc.port_no",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_queue_desc_port_no_reserved,
-            { "Port", "openflow_v6.queue_desc.port_no",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_port_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_port_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_queue_desc_queue_id,
             { "Queue ID", "openflow_v6.queue_desc.queue_id",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_queue_desc_queue_id_reserved,
-            { "Queue ID", "openflow_v6.queue_desc.queue_id",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_queue_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_queue_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_queue_desc_len,
@@ -9489,12 +9001,7 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_queue_desc_prop_min_rate_rate,
             { "Rate", "openflow_v6.queue_desc_prop.min_rate.rate",
-               FT_UINT16, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_queue_desc_prop_min_rate_rate_reserved,
-            { "Rate", "openflow_v6.queue_desc_prop.min_rate.rate",
-               FT_UINT16, BASE_HEX, VALS(openflow_v6_queue_desc_prop_min_rate_reserved_values), 0x0,
+               FT_UINT16, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_queue_desc_prop_min_rate_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_queue_desc_prop_min_rate_pad,
@@ -9504,12 +9011,7 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_queue_desc_prop_max_rate_rate,
             { "Rate", "openflow_v6.queue_desc_prop.max_rate.rate",
-               FT_UINT16, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_queue_desc_prop_max_rate_rate_reserved,
-            { "Rate", "openflow_v6.queue_desc_prop.max_rate.rate",
-               FT_UINT16, BASE_HEX, VALS(openflow_v6_queue_desc_prop_max_rate_reserved_values), 0x0,
+               FT_UINT16, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_queue_desc_prop_max_rate_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_queue_desc_prop_max_rate_pad,
@@ -9750,12 +9252,7 @@ proto_register_openflow_v6(void)
         },
         { &hf_openflow_v6_metermod_meter_id,
             { "Meter ID", "openflow_v6.metermod.meter_id",
-               FT_UINT32, BASE_DEC, NULL, 0x0,
-               NULL, HFILL }
-        },
-        { &hf_openflow_v6_metermod_meter_id_reserved,
-            { "Meter ID", "openflow_v6.metermod.meter_id",
-               FT_UINT32, BASE_HEX, VALS(openflow_v6_meter_id_reserved_values), 0x0,
+               FT_UINT32, BASE_DEC|BASE_SPECIAL_VALS, VALS(openflow_v6_meter_id_reserved_values), 0x0,
                NULL, HFILL }
         },
         { &hf_openflow_v6_role_status_role,