[nes]: ETHERNET changes ...

nes-dev · Mar 16, 2015 · 3e6a4ac · 3e6a4ac
1 parent a59d702
commit 3e6a4ac
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/ethernet/ieee8021QBridgeMib.c b/ethernet/ieee8021QBridgeMib.c
@@ -7366,10 +7366,10 @@ ieee8021QBridgeLearningConstraintDefaultsTable_get (
 	void **my_data_context,
 	netsnmp_variable_list *put_index_data, netsnmp_iterator_info *mydata)
 {
-	ieee8021QBridgeLearningConstraintDefaultsEntry_t *poEntry = NULL;
+	ieee8021BridgeBaseEntry_t *poEntry = NULL;
 	register netsnmp_variable_list *idx1 = put_index_data;
 
-	poEntry = ieee8021QBridgeLearningConstraintDefaultsTable_getByIndex (
+	poEntry = ieee8021BridgeBaseTable_getByIndex (
 		*idx1->val.integer);
 	if (poEntry == NULL)
 	{
@@ -7391,6 +7391,7 @@ ieee8021QBridgeLearningConstraintDefaultsTable_mapper (
 	netsnmp_request_info *request;
 	netsnmp_table_request_info *table_info;
 	ieee8021QBridgeLearningConstraintDefaultsEntry_t *table_entry;
+	register ieee8021BridgeBaseEntry_t *poEntry = NULL;
 	void *pvOldDdata = NULL;
 	int ret;
 
@@ -7402,13 +7403,14 @@ ieee8021QBridgeLearningConstraintDefaultsTable_mapper (
 	case MODE_GET:
 		for (request = requests; request != NULL; request = request->next)
 		{
-			table_entry = (ieee8021QBridgeLearningConstraintDefaultsEntry_t*) netsnmp_extract_iterator_context (request);
+			poEntry = (ieee8021BridgeBaseEntry_t*) netsnmp_extract_iterator_context (request);
 			table_info = netsnmp_extract_table_info (request);
-			if (table_entry == NULL)
+			if (poEntry == NULL)
 			{
 				netsnmp_set_request_error (reqinfo, request, SNMP_NOSUCHINSTANCE);
 				continue;
 			}
+			table_entry = &poEntry->oLearningConstraintDefaults;
 
 			switch (table_info->colnum)
 			{
@@ -7432,8 +7434,9 @@ ieee8021QBridgeLearningConstraintDefaultsTable_mapper (
 	case MODE_SET_RESERVE1:
 		for (request = requests; request != NULL; request = request->next)
 		{
-			table_entry = (ieee8021QBridgeLearningConstraintDefaultsEntry_t*) netsnmp_extract_iterator_context (request);
+			poEntry = (ieee8021BridgeBaseEntry_t*) netsnmp_extract_iterator_context (request);
 			table_info = netsnmp_extract_table_info (request);
+			table_entry = &poEntry->oLearningConstraintDefaults;
 
 			switch (table_info->colnum)
 			{
@@ -7464,10 +7467,10 @@ ieee8021QBridgeLearningConstraintDefaultsTable_mapper (
 	case MODE_SET_RESERVE2:
 		for (request = requests; request != NULL; request = request->next)
 		{
-			table_entry = (ieee8021QBridgeLearningConstraintDefaultsEntry_t*) netsnmp_extract_iterator_context (request);
+			poEntry = (ieee8021BridgeBaseEntry_t*) netsnmp_extract_iterator_context (request);
 			table_info = netsnmp_extract_table_info (request);
 
-			if (table_entry == NULL)
+			if (poEntry == NULL)
 			{
 				netsnmp_set_request_error (reqinfo, request, SNMP_NOSUCHINSTANCE);
 				continue;
@@ -7482,8 +7485,9 @@ ieee8021QBridgeLearningConstraintDefaultsTable_mapper (
 		for (request = requests; request != NULL; request = request->next)
 		{
 			pvOldDdata = netsnmp_request_get_list_data (request, ROLLBACK_BUFFER);
-			table_entry = (ieee8021QBridgeLearningConstraintDefaultsEntry_t*) netsnmp_extract_iterator_context (request);
+			poEntry = (ieee8021BridgeBaseEntry_t*) netsnmp_extract_iterator_context (request);
 			table_info = netsnmp_extract_table_info (request);
+			table_entry = &poEntry->oLearningConstraintDefaults;
 
 			switch (table_info->colnum)
 			{
@@ -7523,12 +7527,13 @@ ieee8021QBridgeLearningConstraintDefaultsTable_mapper (
 		for (request = requests; request != NULL; request = request->next)
 		{
 			pvOldDdata = netsnmp_request_get_list_data (request, ROLLBACK_BUFFER);
-			table_entry = (ieee8021QBridgeLearningConstraintDefaultsEntry_t*) netsnmp_extract_iterator_context (request);
+			poEntry = (ieee8021BridgeBaseEntry_t*) netsnmp_extract_iterator_context (request);
 			table_info = netsnmp_extract_table_info (request);
-			if (table_entry == NULL || pvOldDdata == NULL)
+			if (poEntry == NULL || pvOldDdata == NULL)
 			{
 				continue;
 			}
+			table_entry = &poEntry->oLearningConstraintDefaults;
 
 			switch (table_info->colnum)
 			{