diff options
| author | Chris Horne <Chris.Horne@Sun.COM> | 2008-11-05 06:47:46 -0700 |
|---|---|---|
| committer | Chris Horne <Chris.Horne@Sun.COM> | 2008-11-05 06:47:46 -0700 |
| commit | 62a24de03df1f2399ceda704cb3874dabc98bbbd (patch) | |
| tree | a8177140d3f64d6d964fbc9bd74912a35778a048 /usr/src/uts/common/os/instance.c | |
| parent | 385470574fb49e32c324af06c01d697a16cc3c4b (diff) | |
| download | illumos-gate-62a24de03df1f2399ceda704cb3874dabc98bbbd.tar.gz | |
PSARC/2008/674 nulldriver
6767139 nulldriver
Diffstat (limited to 'usr/src/uts/common/os/instance.c')
| -rw-r--r-- | usr/src/uts/common/os/instance.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr/src/uts/common/os/instance.c b/usr/src/uts/common/os/instance.c index 1e58309d8d..6d4bc8de3f 100644 --- a/usr/src/uts/common/os/instance.c +++ b/usr/src/uts/common/os/instance.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Instance number assignment code */ @@ -317,7 +315,7 @@ in_set_instance(dev_info_t *dip, in_drv_t *dp, major_t major) * Return 1 if instance block was assigned for the path. * * For multi-port NIC cards, sequential instance assignment across all - * ports on a card is highly deseriable since the ppa is typically the + * ports on a card is highly desirable since the ppa is typically the * same as the instance number, and the ppa is used in the NIC's public * /dev name. This sequential assignment typically occurs as a result * of in_preassign_instance() after initial install, or by @@ -760,6 +758,10 @@ e_ddi_keep_instance(dev_info_t *dip) in_node_t *np, *ap; in_drv_t *dp; + /* Don't make nulldriver instance assignments permanent */ + if (ddi_driver_major(dip) == nulldriver_major) + return; + /* * Allow implementation override */ |