From 69954565621127a62c11ec315b175b930230c217 Mon Sep 17 00:00:00 2001 From: Jingjing Duan Date: Wed, 13 Aug 2008 19:29:47 +0100 Subject: [isisd:DLPI] Try open vanity-named DLPI dev before style 1,2 2008-08-13 Jingjing Duan * isisd/isis_dlpi.c: (open_dlpi_dev) Clearview-UV device nodes are under /dev/net, try opening there before attempting style 1 or 2 names. Signed-off-by: Paul Jakma --- isisd/isis_dlpi.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/isisd/isis_dlpi.c b/isisd/isis_dlpi.c index e61dd166..3cbe0b4f 100644 --- a/isisd/isis_dlpi.c +++ b/isisd/isis_dlpi.c @@ -313,12 +313,23 @@ open_dlpi_dev (struct isis_circuit *circuit) circuit->interface->name); return ISIS_WARNING; } - - /* Try first as Style 1 */ - (void) snprintf(devpath, sizeof (devpath), "/dev/%s", - circuit->interface->name); - unit = -1; - fd = dlpiopen (devpath, &acklen); + + /* Try the vanity node first, if permitted */ + if (getenv("DLPI_DEVONLY") == NULL) + { + (void) snprintf (devpath, sizeof(devpath), "/dev/net/%s", + circuit->interface->name); + fd = dlpiopen (devpath, &acklen); + } + + /* Now try as an ordinary Style 1 node */ + if (fd == -1) + { + (void) snprintf (devpath, sizeof (devpath), "/dev/%s", + circuit->interface->name); + unit = -1; + fd = dlpiopen (devpath, &acklen); + } /* If that fails, try again as Style 2 */ if (fd == -1) -- cgit v1.2.1