Merge branch 'adam-snmp'

set temperature thresholds disable logic in object wrsSwcoreStatus Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Merge branch 'adam-snmp'
set temperature thresholds disable logic in object wrsSwcoreStatus Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
39ebdf6c · Adam Wujek · 3e6d9257 · fc4fcb58 · 39ebdf6c · 39ebdf6c
Commit 39ebdf6c authored Jul 08, 2015 by Adam Wujek 💬
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 5 deletions

Kconfig Kconfig +4 -4

wrsNetworkingStatusGroup.c userspace/snmpd/wrsNetworkingStatusGroup.c +6 -1

No files found.
--- a/Kconfig
+++ b/Kconfig
@@ -444,7 +444,7 @@ config SNMP_RW_COMMUNITY

 config SNMP_TEMP_THOLD_FPGA
 	int "Threshold level for FPGA temperature"
-	default "0"
+	default "80"
 	help
 	  Threshold level for FPGA temperature, when exceeded warning is
 	  notified by SNMP via WR-SWITCH-MIB::wrsTemperatureWarning
@@ -452,7 +452,7 @@ config SNMP_TEMP_THOLD_FPGA

 config SNMP_TEMP_THOLD_PLL
 	int "Threshold level for PLL temperature"
-	default "0"
+	default "80"
 	help
 	  Threshold level for PLL temperature, when exceeded warning is
 	  notified by SNMP via WR-SWITCH-MIB::wrsTemperatureWarning
@@ -460,7 +460,7 @@ config SNMP_TEMP_THOLD_PLL

 config SNMP_TEMP_THOLD_PSL
 	int "Threshold level for Power Supply Left (PSL) temperature"
-	default "0"
+	default "80"
 	help
 	  Threshold level for Power Supply Left (PSL) temperature, when
 	  exceeded warning is notified by SNMP via
@@ -469,7 +469,7 @@ config SNMP_TEMP_THOLD_PSL

 config SNMP_TEMP_THOLD_PSR
 	int "Threshold level for Power Supply Right (PSR) temperature"
-	default "0"
+	default "80"
 	help
 	  Threshold level for Power Supply Right (PSR) temperature, when
 	  exceeded warning is notified by SNMP via

--- a/userspace/snmpd/wrsNetworkingStatusGroup.c
+++ b/userspace/snmpd/wrsNetworkingStatusGroup.c
@@ -78,6 +78,7 @@ static int get_endpoint_status(struct ns_pstats *old,
 	return ret;
 }

+/* don't use this function for now, return OK */
 static int get_swcore_status(struct ns_pstats *old,
 			       struct wrsPstatsTable_s *new, unsigned int rows,
 			       float t_delta)
@@ -86,11 +87,15 @@ static int get_swcore_status(struct ns_pstats *old,
 	int ret;
 	ret = 0;

+	/* don't use this function for now, return OK */
+	return ret;
+
 	for (i = 0; i < rows; i++) {
 		/* TXFrames and Forwarded described in 2.2.3 "Problem with the
 		 * SwCore or Endpoint HDL module" in wrs_failures document
 		 * shouldn't differ more than FORWARD_DELTA in total */
-/* counter Forwarded (38) is not implemented in HDL!!! */
+/* counter Forwarded (38) is implemented in HDL, but does not count PTP
+ * traffic!!! */
 #if 0
 		if ( /* shouldn't differ more than FORWARD_DELTA */
 		     ((new[i].TXFrames - new[i].Forwarded) > FORWARD_DELTA)