From f29f9b701d749fd75b668f91657d14459e24f393 Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Tue, 30 Jun 2015 12:28:44 +0200
Subject: [PATCH] check detector mac matches hardware mac only for 1Gbe

---
 .../eigerDetectorServer/slsDetectorFunctionList.c          | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
index e2287f1e0..efc8267ae 100644
--- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
@@ -724,13 +724,14 @@ int executeTrimming(enum trimMode mode, int par1, int par2, int imod){
 
 
 int configureMAC(int ipad, long long int macad, long long int detectormacadd, int detipad, int udpport, int udpport2, int ival){
-
-	if(detectormacadd != getDetectorMAC()){
+	//only for 1Gbe
+	if((!send_to_ten_gig) && (detectormacadd != getDetectorMAC())){
 		printf("*************************************************\n");
 		printf("WARNING: actual detector mac address %llx does not match the one from client %llx\n",getDetectorMAC(),detectormacadd);
+		detectormacadd = getDetectorMAC();
+		printf("WARNING: Matched detectormac to the hardware mac now\n");
 		printf("*************************************************\n");
 	}
-	detectormacadd = getDetectorMAC();
 
 	char src_mac[50], src_ip[50],dst_mac[50], dst_ip[50];
 	int src_port = 0xE185;