Module Name: src
Committed By: christos
Date: Tue Dec 2 19:34:33 UTC 2014
Modified Files:
src/sys/net: dl_print.c if_dl.h
Log Message:
missed _
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/net/dl_print.c
cvs rdiff -u -r1.24 -r1.25 src/sys/net/if_dl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/dl_print.c
diff -u src/sys/net/dl_print.c:1.1 src/sys/net/dl_print.c:1.2
--- src/sys/net/dl_print.c:1.1 Tue Dec 2 14:32:09 2014
+++ src/sys/net/dl_print.c Tue Dec 2 14:34:33 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dl_print.c,v 1.1 2014/12/02 19:32:09 christos Exp $ */
+/* $NetBSD: dl_print.c,v 1.2 2014/12/02 19:34:33 christos Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -29,17 +29,17 @@
#include <sys/types.h>
#ifdef _KERNEL
-__KERNEL_RCSID(0, "$NetBSD: dl_print.c,v 1.1 2014/12/02 19:32:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dl_print.c,v 1.2 2014/12/02 19:34:33 christos Exp $");
#include <sys/systm.h>
#else
-__RCSID("$NetBSD: dl_print.c,v 1.1 2014/12/02 19:32:09 christos Exp $");
+__RCSID("$NetBSD: dl_print.c,v 1.2 2014/12/02 19:34:33 christos Exp $");
#include <stdio.h>
static const uint8_t hexdigits[] = "0123456789abcdef";
#endif
#include <net/if_dl.h>
int
-dl_print(char *buf, size_t len, const struct dladdr *dl)
+dl_print(char *buf, size_t len, const struct dl_addr *dl)
{
const uint8_t *ap = (const uint8_t *)dl->dl_data;
char abuf[256 * 3], *cp, *ecp;
Index: src/sys/net/if_dl.h
diff -u src/sys/net/if_dl.h:1.24 src/sys/net/if_dl.h:1.25
--- src/sys/net/if_dl.h:1.24 Tue Dec 2 14:32:09 2014
+++ src/sys/net/if_dl.h Tue Dec 2 14:34:33 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_dl.h,v 1.24 2014/12/02 19:32:09 christos Exp $ */
+/* $NetBSD: if_dl.h,v 1.25 2014/12/02 19:34:33 christos Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -63,7 +63,7 @@ typedef __socklen_t socklen_t;
#define socklen_t __socklen_t
#endif
-struct dladdr {
+struct dl_addr {
uint8_t dl_type; /* interface type */
uint8_t dl_nlen; /* interface name length, no trailing 0 reqd. */
uint8_t dl_alen; /* link level address length */
@@ -82,7 +82,7 @@ struct sockaddr_dl {
uint8_t sdl_len; /* Total length of sockaddr */
sa_family_t sdl_family; /* AF_LINK */
uint16_t sdl_index; /* if != 0, system given index for interface */
- struct dladdr sdl_addr;
+ struct dl_addr sdl_addr;
#define sdl_type sdl_addr.dl_type
#define sdl_nlen sdl_addr.dl_nlen
#define sdl_alen sdl_addr.dl_alen
@@ -120,7 +120,7 @@ __END_DECLS
// 255 xx: + 255 'a' + / + # + 3 digits + NUL
#define LINK_ADDRSTRLEN ((255 * 4) + 5)
-int dl_print(char *, size_t, const struct dladdr *);
+int dl_print(char *, size_t, const struct dl_addr *);
int sdl_print(char *, size_t, const void *);
#endif
