add more ipaccess 12.21 object classes, NSVC only exists once
diff --git a/openbsc/include/openbsc/abis_nm.h b/openbsc/include/openbsc/abis_nm.h
index 201b902..47baafb 100644
--- a/openbsc/include/openbsc/abis_nm.h
+++ b/openbsc/include/openbsc/abis_nm.h
@@ -244,6 +244,12 @@
 	NM_OC_CHANNEL,
 	NM_OC_BASEB_TRANSC,
 	/* RFU: 05-FE */
+
+	NM_OC_IPAC_E1_TRUNK		= 0x0e,
+	NM_OC_IPAC_E1_PORT		= 0x0f,
+	NM_OC_IPAC_E1_CHAN		= 0x10,
+	NM_OC_IPAC_CLK_MODULE		= 0x22,
+
 	NM_OC_BS11_ADJC			= 0xa0,
 	NM_OC_BS11_HANDOVER		= 0xa1,
 	NM_OC_BS11_PWR_CTRL		= 0xa2,
@@ -256,8 +262,7 @@
 
 	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,
 };
diff --git a/openbsc/src/abis_nm.c b/openbsc/src/abis_nm.c
index b13ce55..f2383e2 100644
--- a/openbsc/src/abis_nm.c
+++ b/openbsc/src/abis_nm.c
@@ -481,10 +481,8 @@
 		return "GPRS NSE";
 	case NM_OC_GPRS_CELL:
 		return "GPRS CELL";
-	case NM_OC_GPRS_NSVC0:
-		return "GPRS NSVC0";
-	case NM_OC_GPRS_NSVC1:
-		return "GPRS NSVC1";
+	case NM_OC_GPRS_NSVC:
+		return "GPRS NSVC";
 	case NM_OC_BS11:
 		return "SIEMENSHW";
 	}