components/quagga/patches/70-isisd-trill.patch
changeset 855 e14713202945
parent 641 719d637aca9f
child 3637 ccffa596a69c
--- a/components/quagga/patches/70-isisd-trill.patch	Tue Jun 05 10:44:59 2012 -0700
+++ b/components/quagga/patches/70-isisd-trill.patch	Tue Jun 05 11:37:57 2012 -0700
@@ -3094,11 +3094,11 @@
 index 0000000..3a38660
 --- /dev/null
 +++ isisd/isis_trill.c
[email protected]@ -0,0 +1,2346 @@
[email protected]@ -0,0 +1,2348 @@
 +/*
 + * IS-IS Rout(e)ing protocol - isis_trill.c
 + *
-+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 + *
 + * This program is free software; you can redistribute it and/or modify it 
 + * under the terms of the GNU General Public Licenseas published by the Free 
@@ -3119,6 +3119,7 @@
 +#include <libdllink.h>
 +#include <libdlbridge.h>
 +#include <libdlvlan.h>
++#include <libnetcfg.h>
 +#include <net/trill.h>
 +
 +#include "thread.h"
@@ -5311,7 +5312,8 @@
 +  dladm_status_t status;
 +  char errmsg[DLADM_STRSIZE];
 +
-+  if ((status = dladm_open (&dlhandle)) != DLADM_STATUS_OK)
++  if ((status = dladm_open (&dlhandle, NETADM_ACTIVE_PROFILE))
++      != DLADM_STATUS_OK)
 +    {
 +      zlog_err ("%s: unable to open datalink control: %s",
 +          area->trill->name, dladm_status2str(status, errmsg));