diff options
| author | ss150715 <none@none> | 2006-04-24 14:41:53 -0700 |
|---|---|---|
| committer | ss150715 <none@none> | 2006-04-24 14:41:53 -0700 |
| commit | 5e1c24c3b8bea565f7bfcd11a154db168c5d2643 (patch) | |
| tree | ce77bbc551561a883c997bb9ed6df0d3f1d3cc6a /usr/src | |
| parent | c2c6897e1a5682452b38f92bc27270708f1e033c (diff) | |
| download | illumos-joyent-5e1c24c3b8bea565f7bfcd11a154db168c5d2643.tar.gz | |
6354549 comma missing in i_dlpi_mac_type[]
6399085 libdlpi.c:i_dlpi_style1_open does not always set diap->style1_failed
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/lib/libdlpi/common/libdlpi.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/usr/src/lib/libdlpi/common/libdlpi.c b/usr/src/lib/libdlpi/common/libdlpi.c index 59d213fffc..fc6dbe0f83 100644 --- a/usr/src/lib/libdlpi/common/libdlpi.c +++ b/usr/src/lib/libdlpi/common/libdlpi.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -66,7 +65,7 @@ const char *i_dlpi_mac_type[] = { "Sync Character", /* 0x06 */ "CTCA", /* 0x07 */ "FDDI", /* 0x08 */ - "unknown" /* 0x09 */ + "unknown", /* 0x09 */ "Frame Relay (LAPF)", /* 0x0a */ "MP Frame Relay", /* 0x0b */ "Async Character", /* 0x0c */ @@ -1104,9 +1103,11 @@ i_dlpi_style1_open(dlpi_if_attr_t *diap) goto failed; diap->style = DL_STYLE1; + diap->style1_failed = B_FALSE; return (fd); failed: + diap->style1_failed = B_TRUE; (void) dlpi_close(fd); return (-1); } @@ -1261,6 +1262,8 @@ dlpi_if_open(const char *ifname, dlpi_if_attr_t *diap, return (-1); } + diap->style1_failed = B_TRUE; + if (!force_style2) { if ((fd = i_dlpi_style1_open(diap)) != -1) return (fd); |