aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/asn1
diff options
context:
space:
mode:
authorDarien Spencer <cusneud@mail.com>2017-08-20 21:38:32 +0300
committerMichael Mann <mmann78@netscape.net>2017-08-26 12:37:26 +0000
commita08e998ca2e7a8229da7f8b292dad94734977f33 (patch)
tree230a8ddf2b578b8728974e48609916694ad99c33 /epan/dissectors/asn1
parent9cd114fbe5d622ef7345259d143b4e09f5c0e6eb (diff)
NBAP: Replaced a comment
Edited a comment to explain the usage of the 'hs-dsch physical layer category' field Change-Id: I400eabd764818bbc39ab1128500b8700647175e3 Reviewed-on: https://code.wireshark.org/review/23218 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/asn1')
-rw-r--r--epan/dissectors/asn1/nbap/nbap.cnf12
-rw-r--r--epan/dissectors/asn1/nbap/packet-nbap-template.c1
2 files changed, 10 insertions, 3 deletions
diff --git a/epan/dissectors/asn1/nbap/nbap.cnf b/epan/dissectors/asn1/nbap/nbap.cnf
index b3114614ec..d3d2e6d975 100644
--- a/epan/dissectors/asn1/nbap/nbap.cnf
+++ b/epan/dissectors/asn1/nbap/nbap.cnf
@@ -1907,7 +1907,11 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items;
umts_fp_conversation_info->num_dch_in_flow++;
umts_fp_conversation_info->dch_ids_in_flow_list[umts_fp_conversation_info->num_dch_in_flow -1] = i;
- /*XXX: Is this craziness, what is physical_layer? */
+ /* The information collected from the 'hsdsch_physical_layer_category' field
+ * is used here to tell if the UE supports MAC-ehs or MAC-hs.
+ * This logic is based on this line in TS 25.306 / Section 5.1 :
+ * "... A UE that supports categories greater or equal to category 13, also supports MAC-ehs."
+ */
if(nbap_hsdsch_channel_info[i].entity == entity_not_specified ){
if(nbap_hsdsch_channel_info[i].hsdsch_physical_layer_category > 12){
@@ -2027,7 +2031,11 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items;
umts_fp_conversation_info->num_dch_in_flow++;
umts_fp_conversation_info->dch_ids_in_flow_list[umts_fp_conversation_info->num_dch_in_flow -1] = i;
- /*XXX: Is this craziness, what is physical_layer? */
+ /* The information collected from the 'hsdsch_physical_layer_category' field
+ * is used here to tell if the UE supports MAC-ehs or MAC-hs.
+ * This logic is based on this line in TS 25.306 / Section 5.1 :
+ * "... A UE that supports categories greater or equal to category 13, also supports MAC-ehs."
+ */
if(nbap_hsdsch_channel_info[i].entity == entity_not_specified ){
if(nbap_hsdsch_channel_info[i].hsdsch_physical_layer_category > 12){
diff --git a/epan/dissectors/asn1/nbap/packet-nbap-template.c b/epan/dissectors/asn1/nbap/packet-nbap-template.c
index e6d0da05f3..d6c0c3a40a 100644
--- a/epan/dissectors/asn1/nbap/packet-nbap-template.c
+++ b/epan/dissectors/asn1/nbap/packet-nbap-template.c
@@ -436,7 +436,6 @@ static void add_hsdsch_bind(packet_info *pinfo){
umts_fp_conversation_info->num_dch_in_flow++;
umts_fp_conversation_info->dch_ids_in_flow_list[umts_fp_conversation_info->num_dch_in_flow -1] = i;
- /*XXX: Is this craziness, what is physical_layer? */
if(nbap_hsdsch_channel_info[i].entity == entity_not_specified ){
/*Error*/
expert_add_info(pinfo, NULL, &ei_nbap_hsdsch_entity_not_specified);