infiniband: consolidate ib_sm_lid and ib_lid

ib_sm_lid becomes type="ib_lid", type_instance="sm"

diff --git a/src/infiniband.c b/src/infiniband.c
index cec3329be53f14a61a85c11008fed3386626ee09..4628ea70e9186c5580a04391b7d4dbfdcf864284 100644 (file)
--- a/src/infiniband.c
+++ b/src/infiniband.c
@@ -168,7 +168,7 @@ static int ib_read_port(const char *device, const char *port) {
                          &value) == 0)
     ib_submit(device, port, &value, 1, "ib_lid_mask_count", "");
   if (ib_read_value_file(device, port, "sm_lid", DS_TYPE_GAUGE, &value) == 0)
-    ib_submit(device, port, &value, 1, "ib_sm_lid", "");
+    ib_submit(device, port, &value, 1, "ib_lid", "sm");
   if (ib_read_value_file(device, port, "sm_sl", DS_TYPE_GAUGE, &value) == 0)
     ib_submit(device, port, &value, 1, "ib_sm_sl", "");
 

diff --git a/src/types.db b/src/types.db
index 4c84dc0cfa548e6e02d65dbcb9223915ee2ababc..a4fd7be7fd5f86b54ab484e56e339e4cf88740c4 100644 (file)
--- a/src/types.db
+++ b/src/types.db
@@ -123,7 +123,6 @@ 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