diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-08-24 05:56:41 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-08-24 05:56:41 +0200 |
| commit | 2ae382d10a07feaed2d8e06ce078084ecaf1b447 (patch) | |
| tree | b9c8c5ab3485c040b19443e4a573f48b9092d47d /util/ilan.c | |
| parent | 7d5dd1122da7acfca715242ec6cb6d1fd844691b (diff) | |
| parent | db5e8f26947114f06480dd22b9db7e22e50ee133 (diff) | |
Merge tag 'upstream/3.0.0'
Upstream version 3.0.0
Diffstat (limited to 'util/ilan.c')
| -rw-r--r-- | util/ilan.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/util/ilan.c b/util/ilan.c index c81c7a9..91dda48 100644 --- a/util/ilan.c +++ b/util/ilan.c @@ -305,7 +305,7 @@ extern char *get_sensor_type_desc(uchar stype); /*from ievents.c*/ /* * Global variables */ -static char * progver = "2.99"; +static char * progver = "3.00"; static char * progname = "ilan"; static char fdebug = 0; static char fipmilan = 0; @@ -342,6 +342,7 @@ static char fpassword = 0; /* =1 user-specified a password, so set it. */ static uchar fmBMC = 0; /* =1 mini-BMC, =0 Sahalee BMC */ static uchar fiBMC = 0; /* =1 Intel iBMC */ static uchar fRomley = 0; /* =1 Intel Romley BMC */ +static uchar fGrantley = 0; static uchar fipv6 = 0; /* =1 if BMC supports IPv6 */ static uchar bmcpefctl = 0; /* existing BMC PEF Control, !0 = enabled */ static char alertnum = 1; /* alert dest num (usu 1 thru 4) */ @@ -4042,14 +4043,15 @@ main(int argc, char **argv) else fsharedMAC = 1; /* usu IPMI 1.x has shared BMC MAC */ break; } /*end switch*/ - if (is_romley(vend_id,prod_id)) { - fRomley = 1; - fiBMC = 1; /* Intel iBMC */ + if (is_romley(vend_id,prod_id)) fRomley = 1; + if (is_grantley(vend_id,prod_id)) fGrantley = 1; + if (fRomley) { + fiBMC = 1; /* Intel iBMC */ fsharedMAC = 0; /* not-shared BMC LAN port, separate MAC */ set_max_kcs_loops(URNLOOPS); /*longer for SetLan (default 300)*/ - fipv6 = 1; - if (fsetarp == 0) arp_ctl = 0x03; /*default to both for Romley*/ - } + fipv6 = 1; + if (fsetarp == 0) arp_ctl = 0x03; /*default to both for Romley*/ + } } else { /* else other vendors */ if (fIPMI20) fsharedMAC = 0; /* recent, not-shared BMC MAC */ else fsharedMAC = 1; /* usu IPMI 1.x has shared BMC MAC */ @@ -4638,7 +4640,7 @@ main(int argc, char **argv) if (ival == 17) ndest = 0; /*error getting num dest*/ } } /*end for*/ - if (fRomley) { /*get LAN Failover param*/ + if (fRomley || fGrantley) { /*get LAN Failover param*/ uchar b; ret = lan_failover_intel(0xFF,(uchar *)&b); if (ret != 0) @@ -5125,7 +5127,7 @@ main(int argc, char **argv) } } if (failover_enable != PARM_INIT) { - if (fRomley) { + if (fRomley || fGrantley) { if (failover_enable > 1) failover_enable = 0; /*default*/ ret = lan_failover_intel(failover_enable,(uchar *)&i); printf("Set Intel Lan Failover (%d), ret = %d\n", |