diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-05-08 22:59:06 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-05-08 22:59:06 +0200 |
| commit | a7c8ed90be739a49937a229828c470f1ad01396e (patch) | |
| tree | 4cd43ff357d98a1ce5afb3bb9449afcce5a299d1 /lib/ipmi_delloem.c | |
| parent | fa5ac2da06fae952fe1295a1e955bdb35e6d86c4 (diff) | |
| parent | 342ebce798fe98ede64939a49bbc3770d8214649 (diff) | |
Merge tag 'upstream/1.8.17'
Upstream version 1.8.17
Diffstat (limited to 'lib/ipmi_delloem.c')
| -rw-r--r-- | lib/ipmi_delloem.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/lib/ipmi_delloem.c b/lib/ipmi_delloem.c index 2214c99..9bb0885 100644 --- a/lib/ipmi_delloem.c +++ b/lib/ipmi_delloem.c @@ -251,6 +251,9 @@ static int ipmi_setled_state(struct ipmi_intf *intf, int bayId, int slotId, int state); static int ipmi_getdrivemap(struct ipmi_intf *intf, int b, int d, int f, int *bayId, int *slotId); +static int +get_nic_selection_mode_12g(struct ipmi_intf* intf,int current_arg, + char ** argv, char *nic_set); /* Function Name: ipmi_delloem_main * @@ -2051,7 +2054,7 @@ IsLANSupported() return 1; } -int +static int get_nic_selection_mode_12g(struct ipmi_intf* intf,int current_arg, char ** argv, char *nic_set) { @@ -2783,8 +2786,6 @@ ipmi_set_power_capstatus_command(struct ipmi_intf * intf, uint8_t val) static int ipmi_powermgmt(struct ipmi_intf * intf) { - time_t now; - struct tm* tm; struct ipmi_rs * rsp; struct ipmi_rq req; uint8_t msg_data[2]; @@ -2811,9 +2812,6 @@ ipmi_powermgmt(struct ipmi_intf * intf) int remainder; int wattReading; - now = time(0); - tm = gmtime(&now); - memset(&req, 0, sizeof(req)); req.msg.netfn = IPMI_NETFN_STORAGE; req.msg.lun = 0; @@ -2893,7 +2891,6 @@ ipmi_powermgmt(struct ipmi_intf * intf) ipmi_time_to_str(ampPeakTimeConv, ampPeakTime); ipmi_time_to_str(wattPeakTimeConv, wattPeakTime); ipmi_time_to_str(bmctimeconv, bmctime); - now = time(0); remainder = (cumReadingConv % 1000); cumReadingConv = cumReadingConv / 1000; @@ -3645,7 +3642,6 @@ ipmi_set_power_cap(struct ipmi_intf * intf, int unit, int val) uint8_t data[13], *rdata; uint16_t powercapval; uint64_t maxpowerbtuphr; - uint64_t maxpowerbtuphr1; uint64_t minpowerbtuphr; IPMI_POWER_CAP ipmipowercap; @@ -3733,11 +3729,10 @@ ipmi_set_power_cap(struct ipmi_intf * intf, int unit, int val) || (val > ipmipowercap.MaximumPowerConsmp)) && (unit == btuphr)) { minpowerbtuphr = watt_to_btuphr_conversion(ipmipowercap.MinimumPowerConsmp); maxpowerbtuphr = watt_to_btuphr_conversion(ipmipowercap.MaximumPowerConsmp); - maxpowerbtuphr1 = watt_to_btuphr_conversion(ipmipowercap.MaximumPowerConsmp); lprintf(LOG_ERR, "Cap value is out of boundary conditon it should be between %d", minpowerbtuphr); - lprintf(LOG_ERR, " -%d", maxpowerbtuphr1); + lprintf(LOG_ERR, " -%d", maxpowerbtuphr); return -1; } rc = ipmi_mc_setsysinfo(intf, 13, data); |