diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-10-22 03:33:19 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-10-22 03:33:19 +0000 |
| commit | 6a603335ce1439666864d2d91facd8335a55e346 (patch) | |
| tree | ca781380ddd3590f8e9bd0489fa33cfa58d09cf1 | |
| parent | 2004-10-21 Ralf Corsepius <ralf_corsepius@rtems.org> (diff) | |
| download | rtems-6a603335ce1439666864d2d91facd8335a55e346.tar.bz2 | |
2004-10-21 Ralf Corsepius <ralf_corsepius@rtems.org>
* libnetworking/net/if_ethersubr.c: Cosmetical updates from FreeBSD.
Add ether_sprintf.
| -rw-r--r-- | cpukit/ChangeLog | 2 | ||||
| -rw-r--r-- | cpukit/libnetworking/net/if_ethersubr.c | 36 |
2 files changed, 26 insertions, 12 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 7ee36189ba..5fa303cb2d 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -2,6 +2,8 @@ * libnetworking/net/if.h; Cosmetical updates from FreeBSD. Remove if_poll* (Not implemented in RTEMS, abandoned by FreeBSD). + * libnetworking/net/if_ethersubr.c: Cosmetical updates from FreeBSD. + Add ether_sprintf. 2004-10-21 Ralf Corsepius <ralf_corsepius@rtems.org> diff --git a/cpukit/libnetworking/net/if_ethersubr.c b/cpukit/libnetworking/net/if_ethersubr.c index bff084b0f8..31c2ed6577 100644 --- a/cpukit/libnetworking/net/if_ethersubr.c +++ b/cpukit/libnetworking/net/if_ethersubr.c @@ -10,10 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -31,6 +27,10 @@ * SUCH DAMAGE. * * @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93 + * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.179 2004/10/12 10:33:41 glebius Exp $ + */ + +/* * $Id$ */ @@ -97,8 +97,8 @@ extern struct ifqueue pkintrq; #define llc_snap_org_code llc_un.type_snap.org_code #define llc_snap_ether_type llc_un.type_snap.ether_type -extern u_char at_org_code[ 3 ]; -extern u_char aarp_org_code[ 3 ]; +extern u_char at_org_code[3]; +extern u_char aarp_org_code[3]; #endif /* NETATALK */ u_char etherbroadcastaddr[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; @@ -112,11 +112,8 @@ u_char etherbroadcastaddr[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; * Assumes that ifp is actually pointer to arpcom structure. */ int -ether_output(ifp, m0, dst, rt0) - register struct ifnet *ifp; - struct mbuf *m0; - struct sockaddr *dst; - struct rtentry *rt0; +ether_output(struct ifnet *ifp, struct mbuf *m, + struct sockaddr *dst, struct rtentry *rt0) { short type; int s, error = 0; @@ -126,7 +123,6 @@ ether_output(ifp, m0, dst, rt0) register struct mbuf *m2; #endif u_char edst[6]; - register struct mbuf *m = m0; register struct rtentry *rt; struct mbuf *mcopy = (struct mbuf *)0; register struct ether_header *eh; @@ -687,6 +683,22 @@ ether_input(ifp, eh, m) } /* + * Convert Ethernet address to printable (loggable) representation. + * This routine is for compatibility; it's better to just use + * + * printf("%6D", <pointer to address>, ":"); + * + * since there's no static buffer involved. + */ +char * +ether_sprintf(const u_char *ap) +{ + static char etherbuf[18]; + snprintf(etherbuf, sizeof (etherbuf), "%6D", ap, ":"); + return (etherbuf); +} + +/* * Perform common duties while attaching to interface list */ void |