diff options
author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-12-07 14:58:33 +0000 |
---|---|---|
committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-12-07 14:58:33 +0000 |
commit | baef2f5cb916acb42bdcfa12530e8a2815d90bc6 (patch) | |
tree | 4a3d83dfcb3a3f956f3e5fd51268fe174ef922a4 /usr/src/lib/libdladm/common/libdlstat.h | |
parent | 1d5a53363c27489cc8b2086775b98eaec3cdb458 (diff) | |
parent | 5690df7e59608f4ee5c051c27524c9d55186cf58 (diff) | |
download | illumos-joyent-baef2f5cb916acb42bdcfa12530e8a2815d90bc6.tar.gz |
[illumos-gate merge]
commit 5690df7e59608f4ee5c051c27524c9d55186cf58
6498 typo in libavl(3LIB) man page
commit ba9ca9119d43e9c8e21e14f2129dce27d2dc0cdc
5468 Missing dependencies in lib/Makefile
commit 62ef8476c4f1cb016de161827d921418dee4b031
4008 libdladm should not have a curses UI inside
commit e8ea23086f5fd6f2b2f60c03b98d019041a374a2
6485 sun-ssh isn't happy with /etc/ssh/moduli contents after 6440
Conflicts:
usr/src/lib/libdladm/Makefile.com
usr/src/cmd/ssh/etc/Makefile
usr/src/lib/Makefile
usr/src/cmd/flowstat/flowstat.c
usr/src/cmd/dladm/dladm.c
Diffstat (limited to 'usr/src/lib/libdladm/common/libdlstat.h')
-rw-r--r-- | usr/src/lib/libdladm/common/libdlstat.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/usr/src/lib/libdladm/common/libdlstat.h b/usr/src/lib/libdladm/common/libdlstat.h index 381dafe22d..c799723a91 100644 --- a/usr/src/lib/libdladm/common/libdlstat.h +++ b/usr/src/lib/libdladm/common/libdlstat.h @@ -261,9 +261,6 @@ typedef struct pktsum_s { uint64_t oerrors; } pktsum_t; -extern void dladm_continuous(dladm_handle_t, datalink_id_t, - const char *, int, int); - extern kstat_t *dladm_kstat_lookup(kstat_ctl_t *, const char *, int, const char *, const char *); extern void dladm_get_stats(kstat_ctl_t *, kstat_t *, pktsum_t *); |