From d113dbfd1829d96a14a9fac944c4a79c24073a17 Mon Sep 17 00:00:00 2001
From: Pau Espin Pedrol <pespin@sysmocom.de>
Date: Thu, 3 Dec 2020 17:40:05 +0100
Subject: [PATCH] GSM A-bis/OML: Fix ipaccess specific GPRS NSVC obj class

All NSVCs share the same object class, and the NSVCI is encoded in the
FOM Object Instance TRX byte.
---
 epan/dissectors/packet-gsm_abis_oml.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/epan/dissectors/packet-gsm_abis_oml.c b/epan/dissectors/packet-gsm_abis_oml.c
index 9f206aab71..d52e33e093 100644
--- a/epan/dissectors/packet-gsm_abis_oml.c
+++ b/epan/dissectors/packet-gsm_abis_oml.c
@@ -242,8 +242,7 @@ enum abis_nm_obj_class {
 
 	NM_OC_GPRS_NSE			= 0xf0,
 	NM_OC_GPRS_CELL			= 0xf1,
-	NM_OC_GPRS_NSVC0		= 0xf2,
-	NM_OC_GPRS_NSVC1		= 0xf3,
+	NM_OC_GPRS_NSVC			= 0xf2,
 
 	NM_OC_NULL			= 0xff
 };
@@ -948,8 +947,7 @@ static const value_string oml_fom_objclass_vals[] = {
 
 	{ NM_OC_GPRS_NSE,		"GPRS NSE" },
 	{ NM_OC_GPRS_CELL,		"GPRS Cell" },
-	{ NM_OC_GPRS_NSVC0,		"GPRS NSVC0" },
-	{ NM_OC_GPRS_NSVC1,		"GPRS NSVC1" },
+	{ NM_OC_GPRS_NSVC,		"GPRS NSVC" },
 
 	{ NM_OC_NULL,			"NULL" },
 	{ 0, NULL }