folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PDP11, all VAXen: Remove duplicate network address conflict message

Browse source 
Address conflict message now generated within the
eth_check_address_conflict routine.
This commit is contained in:
Mark Pizzolato 2019-01-11 23:24:28 -08:00
parent 7478ddc7d4
commit f6906af25a
2 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
PDP11/pdp11_xq.c
View file

@ -2901,10 +2901,6 @@ t_stat xq_attach(UNIT* uptr, CONST char* cptr)
xq->var->must_poll = (SCPE_OK != eth_clr_async(xq->var->etherface)); xq->var->must_poll = (SCPE_OK != eth_clr_async(xq->var->etherface));
} }
if (SCPE_OK != eth_check_address_conflict (xq->var->etherface, &xq->var->mac)) { if (SCPE_OK != eth_check_address_conflict (xq->var->etherface, &xq->var->mac)) {
char buf[32];
eth_mac_fmt(&xq->var->mac, buf); /* format ethernet mac address */
sim_printf("%s: MAC Address Conflict on LAN for address %s, change the MAC address to a unique value\n", xq->dev->name, buf);
eth_close(xq->var->etherface); eth_close(xq->var->etherface);
free(tptr); free(tptr);
free(xq->var->etherface); free(xq->var->etherface);

4
PDP11/pdp11_xu.c
View file

@ -1776,10 +1776,6 @@ t_stat xu_attach(UNIT* uptr, CONST char* cptr)
} }
eth_set_throttle (xu->var->etherface, xu->var->throttle_time, xu->var->throttle_burst, xu->var->throttle_delay); eth_set_throttle (xu->var->etherface, xu->var->throttle_time, xu->var->throttle_burst, xu->var->throttle_delay);
if (SCPE_OK != eth_check_address_conflict (xu->var->etherface, &xu->var->mac)) { if (SCPE_OK != eth_check_address_conflict (xu->var->etherface, &xu->var->mac)) {
char buf[32];
eth_mac_fmt(&xu->var->mac, buf); /* format ethernet mac address */
sim_printf("%s: MAC Address Conflict on LAN for address %s\n", xu->dev->name, buf);
eth_close(xu->var->etherface); eth_close(xu->var->etherface);
free(tptr); free(tptr);
free(xu->var->etherface); free(xu->var->etherface);