From 187480156ad51e034a12aebffc44c664059218b8 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Wed, 16 Jan 2013 21:29:09 +0100 Subject: [PATCH] kernel/netgraph7: Use kether_ntoa(). --- sys/netgraph7/bridge/ng_bridge.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/netgraph7/bridge/ng_bridge.c b/sys/netgraph7/bridge/ng_bridge.c index ff1c34086b..2860b8190d 100644 --- a/sys/netgraph7/bridge/ng_bridge.c +++ b/sys/netgraph7/bridge/ng_bridge.c @@ -841,12 +841,13 @@ ng_bridge_put(priv_p priv, const u_char *addr, int linkNum) { const int bucket = HASH(addr, priv->hashMask); struct ng_bridge_hent *hent; + char ethstr[ETHER_ADDRSTRLEN + 1] __debugvar; #ifdef INVARIANTS /* Assert that entry does not already exist in hashtable */ SLIST_FOREACH(hent, &priv->tab[bucket], next) { KASSERT(!ETHER_EQUAL(hent->host.addr, addr), - ("%s: entry %s exists in table", __func__, ether_sprintf(addr))); + ("%s: entry %s exists in table", __func__, kether_ntoa(addr, ethstr))); } #endif @@ -969,6 +970,7 @@ ng_bridge_timeout(node_p node, hook_p hook, void *arg1, int arg2) int bucket; int counter = 0; int linkNum; + char ethstr[ETHER_ADDRSTRLEN + 1] __debugvar; /* Update host time counters and remove stale entries */ for (bucket = 0; bucket < priv->numBuckets; bucket++) { @@ -980,7 +982,7 @@ ng_bridge_timeout(node_p node, hook_p hook, void *arg1, int arg2) /* Make sure host's link really exists */ KASSERT(priv->links[hent->host.linkNum] != NULL, ("%s: host %s on nonexistent link %d", - __func__, ether_sprintf(hent->host.addr), + __func__, kether_ntoa(hent->host.addr, ethstr), hent->host.linkNum)); /* Remove hosts we haven't heard from in a while */ -- 2.41.0