From a2cf8611ed09da746bf290a1077cce90dff612e8 Mon Sep 17 00:00:00 2001
From: Raymond Knopp <raymond.knopp@eurecom.fr>
Date: Sat, 4 Aug 2018 08:39:25 +0200
Subject: [PATCH] small modifications for CentOS build
---
openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c | 6 ++++++
openair1/PHY/LTE_UE_TRANSPORT/linear_preprocessing_rec.c | 9 +++++++--
openair2/NETWORK_DRIVER/MESH/device.c | 4 ++++
openair2/NETWORK_DRIVER/UE_IP/device.c | 6 +++++-
4 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c b/openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
index a414c85c162..760d44719e3 100644
--- a/openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
+++ b/openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
@@ -40,8 +40,14 @@
#include<math.h>
#include <stdlib.h>
#include <string.h>
+#include <linux/version.h>
+#if RHEL_RELEASE_CODE >= 1796
+#include <lapacke/lapacke_utils.h>
+#include <lapacke/lapacke.h>
+#else
#include <lapacke_utils.h>
#include <lapacke.h>
+#endif
#include <cblas.h>
#include "linear_preprocessing_rec.h"
diff --git a/openair1/PHY/LTE_UE_TRANSPORT/linear_preprocessing_rec.c b/openair1/PHY/LTE_UE_TRANSPORT/linear_preprocessing_rec.c
index d85d4401937..7d063e326ef 100644
--- a/openair1/PHY/LTE_UE_TRANSPORT/linear_preprocessing_rec.c
+++ b/openair1/PHY/LTE_UE_TRANSPORT/linear_preprocessing_rec.c
@@ -13,9 +13,14 @@ data storage. */
#include <stdlib.h>
#include <cblas.h>
#include <string.h>
+#include <linux/version.h>
+#if RHEL_RELEASE_CODE >= 1796
+#include <lapacke/lapacke_utils.h>
+#include <lapacke/lapacke.h>
+#else
#include <lapacke_utils.h>
#include <lapacke.h>
-
+#endif
//#define DEBUG_PREPROC
@@ -366,4 +371,4 @@ float sqrt_float(float x, float sqrt_x)
{
sqrt_x = (float)(sqrt((double)(x)));
return sqrt_x;
-}
\ No newline at end of file
+}
diff --git a/openair2/NETWORK_DRIVER/MESH/device.c b/openair2/NETWORK_DRIVER/MESH/device.c
index f8a420697a9..f5d31742bc4 100644
--- a/openair2/NETWORK_DRIVER/MESH/device.c
+++ b/openair2/NETWORK_DRIVER/MESH/device.c
@@ -324,7 +324,11 @@ static const struct net_device_ops nasmesh_netdev_ops = {
.ndo_set_mac_address = NULL,
.ndo_set_config = nas_set_config,
.ndo_do_ioctl = nas_CTL_ioctl,
+#if RHEL_RELEASE_CODE>=1797
+ .extended.ndo_change_mtu = nas_change_mtu,
+#else
.ndo_change_mtu = nas_change_mtu,
+#endif
.ndo_tx_timeout = nas_tx_timeout,
};
diff --git a/openair2/NETWORK_DRIVER/UE_IP/device.c b/openair2/NETWORK_DRIVER/UE_IP/device.c
index d9a91496859..47c820fe775 100644
--- a/openair2/NETWORK_DRIVER/UE_IP/device.c
+++ b/openair2/NETWORK_DRIVER/UE_IP/device.c
@@ -349,7 +349,11 @@ static const struct net_device_ops ue_ip_netdev_ops = {
.ndo_set_mac_address = ue_ip_set_mac_address,
.ndo_set_config = ue_ip_set_config,
.ndo_do_ioctl = NULL,
- .ndo_change_mtu = ue_ip_change_mtu,
+#if RHEL_RELEASE_CODE>=1797
+ .extended.ndo_change_mtu = ue_ip_change_mtu,
+#else
+ .ndo_change_mtu = ue_ip_change_mtu,
+#endif
.ndo_tx_timeout = ue_ip_tx_timeout,
.ndo_change_rx_flags = ue_ip_change_rx_flags,
};
--
GitLab