From f6906af25a70a8bd212c9e93a2fcd20b9f7f9d56 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Fri, 11 Jan 2019 23:24:28 -0800 Subject: [PATCH] PDP11, all VAXen: Remove duplicate network address conflict message Address conflict message now generated within the eth_check_address_conflict routine. --- PDP11/pdp11_xq.c | 4 ---- PDP11/pdp11_xu.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/PDP11/pdp11_xq.c b/PDP11/pdp11_xq.c index 5e7041a3..1e52089c 100644 --- a/PDP11/pdp11_xq.c +++ b/PDP11/pdp11_xq.c @@ -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)); } 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); free(tptr); free(xq->var->etherface); diff --git a/PDP11/pdp11_xu.c b/PDP11/pdp11_xu.c index f86d6380..a05d36d5 100644 --- a/PDP11/pdp11_xu.c +++ b/PDP11/pdp11_xu.c @@ -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); 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); free(tptr); free(xu->var->etherface);