diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2012-09-28 20:36:03 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2012-09-28 20:36:03 +0000 |
| commit | 12c71b2ff1011a620d24e47aa776861b9773ad18 (patch) | |
| tree | 8ce1a71adde4fd3d7c79dd5cbc4fb305e28569b3 /epan/dissectors/packet-gsm_rlcmac.c | |
| parent | f8a2fd3010ed7de09f8cd7e608f0e8b92d627ea9 (diff) | |
Remove a duplicate hf
svn path=/trunk/; revision=45198
Diffstat (limited to 'epan/dissectors/packet-gsm_rlcmac.c')
| -rw-r--r-- | epan/dissectors/packet-gsm_rlcmac.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/epan/dissectors/packet-gsm_rlcmac.c b/epan/dissectors/packet-gsm_rlcmac.c index 096472107c..d7020120ec 100644 --- a/epan/dissectors/packet-gsm_rlcmac.c +++ b/epan/dissectors/packet-gsm_rlcmac.c @@ -108,7 +108,6 @@ static int ett_data_segments = -1; static int hf_usf = -1; static int hf_ul_payload_type = -1; static int hf_dl_payload_type = -1; -static int hf_ul_retry_bit = -1; static int hf_rrbp = -1; static int hf_s_p = -1; static int hf_es_p = -1; @@ -6065,7 +6064,7 @@ CSN_DESCR_BEGIN (UL_Data_Mac_Header_t) M_UINT (UL_Data_Mac_Header_t, Payload_Type, 2, &hf_ul_payload_type), M_UINT (UL_Data_Mac_Header_t, Countdown_Value, 4, &hf_countdown_value), M_UINT (UL_Data_Mac_Header_t, SI, 1, &hf_ul_data_si), - M_UINT (UL_Data_Mac_Header_t, R, 1, &hf_ul_retry_bit), + M_UINT (UL_Data_Mac_Header_t, R, 1, &hf_ul_retry), CSN_DESCR_END (UL_Data_Mac_Header_t) CSN_DESCR_BEGIN (UL_Data_Block_GPRS_t) @@ -6083,7 +6082,7 @@ CSN_DESCR_BEGIN (UL_Data_Block_EGPRS_Header_Type1_t) M_BITS_CRUMB (UL_Data_Block_EGPRS_Header_Type1_t, TFI, bits_spec_ul_tfi, 1, &hf_uplink_tfi), M_UINT (UL_Data_Block_EGPRS_Header_Type1_t, Countdown_Value, 4, &hf_countdown_value), M_UINT (UL_Data_Block_EGPRS_Header_Type1_t, SI, 1, &hf_ul_data_si), - M_UINT (UL_Data_Block_EGPRS_Header_Type1_t, R, 1, &hf_ul_retry_bit), + M_UINT (UL_Data_Block_EGPRS_Header_Type1_t, R, 1, &hf_ul_retry), M_SPLIT_BITS (UL_Data_Block_EGPRS_Header_Type1_t, BSN1, bits_spec_ul_bsn1, 11, &hf_bsn), M_BITS_CRUMB (UL_Data_Block_EGPRS_Header_Type1_t, BSN1, bits_spec_ul_bsn1, 1, &hf_bsn), M_BITS_CRUMB (UL_Data_Block_EGPRS_Header_Type1_t, TFI, bits_spec_ul_tfi, 0, &hf_uplink_tfi), @@ -6104,7 +6103,7 @@ CSN_DESCR_BEGIN (UL_Data_Block_EGPRS_Header_Type2_t) M_BITS_CRUMB (UL_Data_Block_EGPRS_Header_Type2_t, TFI, bits_spec_ul_tfi, 1, &hf_uplink_tfi), M_UINT (UL_Data_Block_EGPRS_Header_Type2_t, Countdown_Value, 4, &hf_countdown_value), M_UINT (UL_Data_Block_EGPRS_Header_Type2_t, SI, 1, &hf_ul_data_si), - M_UINT (UL_Data_Block_EGPRS_Header_Type2_t, R, 1, &hf_ul_retry_bit), + M_UINT (UL_Data_Block_EGPRS_Header_Type2_t, R, 1, &hf_ul_retry), M_SPLIT_BITS (UL_Data_Block_EGPRS_Header_Type2_t, BSN1, bits_spec_ul_bsn1, 11, &hf_bsn), M_BITS_CRUMB (UL_Data_Block_EGPRS_Header_Type2_t, BSN1, bits_spec_ul_bsn1, 1, &hf_bsn), M_BITS_CRUMB (UL_Data_Block_EGPRS_Header_Type2_t, TFI, bits_spec_ul_tfi, 0, &hf_uplink_tfi), @@ -6124,7 +6123,7 @@ CSN_DESCR_BEGIN (UL_Data_Block_EGPRS_Header_Type3_t) M_BITS_CRUMB (UL_Data_Block_EGPRS_Header_Type3_t, TFI, bits_spec_ul_tfi, 1, &hf_uplink_tfi), M_UINT (UL_Data_Block_EGPRS_Header_Type3_t, Countdown_Value, 4, &hf_countdown_value), M_UINT (UL_Data_Block_EGPRS_Header_Type3_t, SI, 1, &hf_ul_data_si), - M_UINT (UL_Data_Block_EGPRS_Header_Type3_t, R, 1, &hf_ul_retry_bit), + M_UINT (UL_Data_Block_EGPRS_Header_Type3_t, R, 1, &hf_ul_retry), M_SPLIT_BITS (UL_Data_Block_EGPRS_Header_Type3_t, BSN1, bits_spec_ul_bsn1, 11, &hf_bsn), M_BITS_CRUMB (UL_Data_Block_EGPRS_Header_Type3_t, BSN1, bits_spec_ul_bsn1, 1, &hf_bsn), M_BITS_CRUMB (UL_Data_Block_EGPRS_Header_Type3_t, TFI, bits_spec_ul_tfi, 0, &hf_uplink_tfi), @@ -7879,13 +7878,6 @@ proto_register_gsm_rlcmac(void) NULL, HFILL } }, - { &hf_ul_retry_bit, - { "R", - "gsm_rlcmac.ul.retry", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL - } - }, { &hf_rrbp, { "RRBP", "gsm_rlcmac.rrbp", |