diff options
| author | Bill Meier <wmeier@newsguy.com> | 2009-08-09 15:07:35 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2009-08-09 15:07:35 +0000 |
| commit | 0a60e46adf9869c1f095410163073395624a0612 (patch) | |
| tree | 77c13d5c66dc862613b0eb1e8a6fed87876425be /plugins/wimax/msg_arq.c | |
| parent | cdb8e2c6b7397fe92de7e7e957b6231d26467378 (diff) | |
'if(proto_... == -1)' not req'd; Don't register ett[] more than once;
svn path=/trunk/; revision=29351
Diffstat (limited to 'plugins/wimax/msg_arq.c')
| -rw-r--r-- | plugins/wimax/msg_arq.c | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/plugins/wimax/msg_arq.c b/plugins/wimax/msg_arq.c index a3783e6cd6..d83f9c8766 100644 --- a/plugins/wimax/msg_arq.c +++ b/plugins/wimax/msg_arq.c @@ -307,39 +307,26 @@ void proto_register_mac_mgmt_msg_arq_feedback(void) } }; - if (proto_mac_mgmt_msg_arq_feedback_decoder == -1) - { - proto_mac_mgmt_msg_arq_feedback_decoder = proto_register_protocol ( - "WiMax ARQ Feedback/Discard/Reset Messages", /* name */ - "WiMax ARQ Feedback/Discard/Reset (arq)", /* short name */ - "wmx.arq" /* abbrev */ - ); - - proto_register_field_array(proto_mac_mgmt_msg_arq_feedback_decoder, hf, array_length(hf)); - proto_register_subtree_array(ett, array_length(ett)); - } + proto_mac_mgmt_msg_arq_feedback_decoder = proto_register_protocol ( + "WiMax ARQ Feedback/Discard/Reset Messages", /* name */ + "WiMax ARQ Feedback/Discard/Reset (arq)", /* short name */ + "wmx.arq" /* abbrev */ + ); + + proto_register_field_array(proto_mac_mgmt_msg_arq_feedback_decoder, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); } /* Register Wimax Mac Payload Protocol and Dissector */ void proto_register_mac_mgmt_msg_arq_discard(void) { - if (proto_mac_mgmt_msg_arq_discard_decoder == -1) - { - proto_mac_mgmt_msg_arq_discard_decoder = proto_mac_mgmt_msg_arq_feedback_decoder; - - proto_register_subtree_array(ett, array_length(ett)); - } + proto_mac_mgmt_msg_arq_discard_decoder = proto_mac_mgmt_msg_arq_feedback_decoder; } /* Register Wimax Mac Payload Protocol and Dissector */ void proto_register_mac_mgmt_msg_arq_reset(void) { - if (proto_mac_mgmt_msg_arq_reset_decoder == -1) - { - proto_mac_mgmt_msg_arq_reset_decoder = proto_mac_mgmt_msg_arq_feedback_decoder; - - proto_register_subtree_array(ett, array_length(ett)); - } + proto_mac_mgmt_msg_arq_reset_decoder = proto_mac_mgmt_msg_arq_feedback_decoder; } /* Decode ARQ-Feedback messages. */ |