From edc700ed9a279eb5a396b31b11132906a62830c9 Mon Sep 17 00:00:00 2001
From: Marie-Josee Blais <blaism@users.sourceforge.net>
Date: Tue, 9 Jul 2013 12:25:12 +0000
Subject: [PATCH] Added code to support sensors on other luns (On behalf of
 Kontron Germany)

---
 ipmitool/lib/ipmi_sdr.c    | 5 +++++
 ipmitool/lib/ipmi_sensor.c | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/ipmitool/lib/ipmi_sdr.c b/ipmitool/lib/ipmi_sdr.c
index 89357f3..c6774c9 100644
--- a/ipmitool/lib/ipmi_sdr.c
+++ b/ipmitool/lib/ipmi_sdr.c
@@ -468,6 +468,7 @@ ipmi_sdr_get_sensor_thresholds(struct ipmi_intf *intf, uint8_t sensor,
 
 	memset(&req, 0, sizeof (req));
 	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.lun = lun;
 	req.msg.cmd = GET_SENSOR_THRESHOLDS;
 	req.msg.data = &sensor;
 	req.msg.data_len = sizeof (sensor);
@@ -512,6 +513,7 @@ ipmi_sdr_get_sensor_hysteresis(struct ipmi_intf *intf, uint8_t sensor,
 
 	memset(&req, 0, sizeof (req));
 	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.lun = lun;
 	req.msg.cmd = GET_SENSOR_HYSTERESIS;
 	req.msg.data = rqdata;
 	req.msg.data_len = 2;
@@ -573,6 +575,7 @@ ipmi_sdr_get_sensor_reading_ipmb(struct ipmi_intf *intf, uint8_t sensor,
 	}
 	memset(&req, 0, sizeof (req));
 	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.lun = lun;
 	req.msg.cmd = GET_SENSOR_READING;
 	req.msg.data = &sensor;
 	req.msg.data_len = 1;
@@ -612,6 +615,7 @@ ipmi_sdr_get_sensor_event_status(struct ipmi_intf *intf, uint8_t sensor,
 	}
 	memset(&req, 0, sizeof (req));
 	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.lun = lun;
 	req.msg.cmd = GET_SENSOR_EVENT_STATUS;
 	req.msg.data = &sensor;
 	req.msg.data_len = 1;
@@ -652,6 +656,7 @@ ipmi_sdr_get_sensor_event_enable(struct ipmi_intf *intf, uint8_t sensor,
 
 	memset(&req, 0, sizeof (req));
 	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.lun = lun;
 	req.msg.cmd = GET_SENSOR_EVENT_ENABLE;
 	req.msg.data = &sensor;
 	req.msg.data_len = 1;
diff --git a/ipmitool/lib/ipmi_sensor.c b/ipmitool/lib/ipmi_sensor.c
index 31adf1f..42e8853 100644
--- a/ipmitool/lib/ipmi_sensor.c
+++ b/ipmitool/lib/ipmi_sensor.c
@@ -72,6 +72,7 @@ ipmi_sensor_get_sensor_reading_factors(
 
 	memset(&req, 0, sizeof(req));
 	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.lun = sensor->cmn.keys.lun;
 	req.msg.cmd   = GET_SENSOR_FACTORS;
 	req.msg.data  = req_data;
 	req.msg.data_len = sizeof(req_data);
@@ -138,6 +139,7 @@ ipmi_sensor_set_sensor_thresholds(struct ipmi_intf *intf,
 	}
 	memset(&req, 0, sizeof (req));
 	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.lun = lun;
 	req.msg.cmd = SET_SENSOR_THRESHOLDS;
 	req.msg.data = (uint8_t *) & set_thresh_rq;
 	req.msg.data_len = sizeof (set_thresh_rq);