author | Geoffrey Gardella <geoffrey.gardella@oracle.com> |
Fri, 15 May 2015 14:07:20 -0700 | |
changeset 4298 | aa030c46708c |
parent 3641 | 5e7228d629ab |
permissions | -rw-r--r-- |
3641
5e7228d629ab
20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
1 |
This patch is a solaris specific one which fixes a build issue |
5e7228d629ab
20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
2 |
related to change in the prototype of a dladm function. This has |
5e7228d629ab
20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
3 |
not been submitted to the community. |
5e7228d629ab
20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
4 |
--- net-snmp-5.4.1.old/agent/mibgroup/kernel_sunos5.c 2015-01-08 06:55:57.165428600 -0600 |
5e7228d629ab
20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
5 |
+++ net-snmp-5.4.1/agent/mibgroup/kernel_sunos5.c 2015-01-08 06:50:09.992840500 -0600 |
5e7228d629ab
20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
6 |
@@ -62,6 +62,7 @@ |
5e7228d629ab
20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
7 |
|
5e7228d629ab
20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
8 |
#include <libdladm.h> |
5e7228d629ab
20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
9 |
#include <libdllink.h> |
5e7228d629ab
20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
10 |
+#include <libnetcfg.h> |
5e7228d629ab
20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
11 |
/*- |
5e7228d629ab
20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
12 |
* Includes of local application header files |
5e7228d629ab
20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
13 |
*/ |
5e7228d629ab
20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
14 |
@@ -1733,7 +1734,12 @@ |
5e7228d629ab
20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
15 |
dladm_phys_attr_t dpa; |
5e7228d629ab
20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
16 |
dladm_handle_t handle; |
5e7228d629ab
20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
17 |
|
5e7228d629ab
20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
18 |
- if (dladm_open(&handle, NULL) != DLADM_STATUS_OK) { |
5e7228d629ab
20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
19 |
+#ifdef NETADM_ACTIVE_PROFILE |
5e7228d629ab
20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
20 |
+ if (dladm_open(&handle, NULL) |
5e7228d629ab
20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
21 |
+#else |
5e7228d629ab
20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
22 |
+ if (dladm_open(&handle) |
5e7228d629ab
20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
23 |
+#endif |
5e7228d629ab
20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
24 |
+ != DLADM_STATUS_OK) { |
5e7228d629ab
20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
25 |
DEBUGMSGTL(("kernel_sunos5","dladm_open failed " |
5e7228d629ab
20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
26 |
"with errno=%d\n",errno)); |
5e7228d629ab
20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
27 |
return (-1); |