infiniband: revert the merge of ib_lid and ib_sm_lid

diff --git a/src/infiniband.c b/src/infiniband.c
index cb94aed130143a97fa943cfed34d8d5d678c1d83..5467a62516c84b4088d6a1681962be80bdc8e438 100644 (file)
--- a/src/infiniband.c
+++ b/src/infiniband.c
@@ -175,7 +175,7 @@ static int ib_read_port(const char *device, const char *port) {
     ib_submit(device, port, &value, 1, "ib_lid_mask_count", "");
   // The LID of the master SM (subnet manager) that is managing this port
   if (ib_read_value_file(device, port, "sm_lid", DS_TYPE_GAUGE, &value) == 0)
-    ib_submit(device, port, &value, 1, "ib_lid", "sm");
+    ib_submit(device, port, &value, 1, "ib_sm_lid", "");
   // The administrative SL (service level) of the master SM that is managing
   //    this port
   if (ib_read_value_file(device, port, "sm_sl", DS_TYPE_GAUGE, &value) == 0)

diff --git a/src/types.db b/src/types.db
index a4fd7be7fd5f86b54ab484e56e339e4cf88740c4..4c84dc0cfa548e6e02d65dbcb9223915ee2ababc 100644 (file)
--- a/src/types.db
+++ b/src/types.db
@@ -123,6 +123,7 @@ ib_octets               rx:DERIVE:0:U tx:DERIVE:0:U
 ib_packets              rx:DERIVE:0:U tx:DERIVE:0:U
 ib_phys_state           value:GAUGE:0:15
 ib_rate                 value:GAUGE:0:U
+ib_sm_lid               value:GAUGE:0:32767
 ib_sm_sl                value:GAUGE:0:15
 ib_state                value:GAUGE:0:15
 ib_xmit_wait            value:DERIVE:0:U