summaryrefslogtreecommitdiff
path: root/cleopatre/application/spidnetsnmp/agent/mibgroup
diff options
context:
space:
mode:
authorCyril Jourdan2012-09-20 19:09:23 +0200
committerCyril Jourdan2012-09-20 19:09:23 +0200
commit8f3219ba5bcf33a875ed8d852ee5604ab3c58e1a (patch)
tree282ad88490676408bf0459d7d1d47e9ec897a270 /cleopatre/application/spidnetsnmp/agent/mibgroup
parentf814ad72bc122d60933f5c8e4f95544ec9f33e40 (diff)
parentc0ec44be34d1d3aa611ec82bae4e281e70727225 (diff)
Merge branch 'mse500-asic' into eoc-mse500-asic
In order to make this commit compile, we had to extract some functions from LEON ILRAM. We made this by playing on the ARCH_ILRAM_PRIO config item, but we will do some fine tuning later. Conflicts: cleopatre/devkit/tests/libspid/utests/src/system_utests.c cleopatre/tools/openocd-r668/src/flash/spc300.h common/tests/tests
Diffstat (limited to 'cleopatre/application/spidnetsnmp/agent/mibgroup')
-rw-r--r--cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCCLTMACGroup/modEoCOnlineCLTTable/modEoCOnlineCLTTable_data_access.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCCLTMACGroup/modEoCOnlineCLTTable/modEoCOnlineCLTTable_data_access.c b/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCCLTMACGroup/modEoCOnlineCLTTable/modEoCOnlineCLTTable_data_access.c
index d08c5af094..7b12ca4824 100644
--- a/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCCLTMACGroup/modEoCOnlineCLTTable/modEoCOnlineCLTTable_data_access.c
+++ b/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCCLTMACGroup/modEoCOnlineCLTTable/modEoCOnlineCLTTable_data_access.c
@@ -489,7 +489,7 @@ modEoCOnlineCLTTable_container_load(netsnmp_container * container)
if (LIBSPID_SUCCESS != ret){
memset(modEoCOnlineCLTUpLinkDeviceMACAddress, 0, 6);
} else {
- memcpy(modEoCOnlineCLTUpLinkDeviceMACAddress, nvram.eth_address, 6);
+ memcpy(modEoCOnlineCLTUpLinkDeviceMACAddress, nvram.eth1_address, 6);
}
rowreq_ctx->data.modEoCOnlineCLTUpLinkDeviceMACAddress_len = 6;