maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove RHEL_RELEASE_CODE define

Browse Source
This commit is contained in:
Robert Schmidt
2022-06-19 18:02:08 +02:00
parent dab905519b
commit 4f44a1026b
4 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
+2 -7
View File
@@ -41,13 +41,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <linux/version.h> #include <linux/version.h>
#if RHEL_RELEASE_CODE >= 1796 #include <lapacke_utils.h>
#include <lapacke/lapacke_utils.h> #include <lapacke.h>
#include <lapacke/lapacke.h>
#else
#include <lapacke_utils.h>
#include <lapacke.h>
#endif
#include <cblas.h> #include <cblas.h>
#include "linear_preprocessing_rec.h" #include "linear_preprocessing_rec.h"
openair1/PHY/LTE_UE_TRANSPORT/linear_preprocessing_rec.c
-5
View File
@@ -14,13 +14,8 @@ data storage. */
#include <cblas.h> #include <cblas.h>
#include <string.h> #include <string.h>
#include <linux/version.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_utils.h>
#include <lapacke.h> #include <lapacke.h>
#endif
//#define DEBUG_PREPROC //#define DEBUG_PREPROC
openair2/NETWORK_DRIVER/MESH/device.c
+3 -3
View File
@@ -198,7 +198,7 @@ int nas_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
// End debug information // End debug information
netif_stop_queue(dev); netif_stop_queue(dev);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) || (defined RHEL_RELEASE_CODE && RHEL_RELEASE_CODE>=1796) #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
netif_trans_update(dev); netif_trans_update(dev);
#else #else
dev->trans_start = jiffies; dev->trans_start = jiffies;
@@ -267,7 +267,7 @@ void nas_tx_timeout(struct net_device *dev)
printk("TX_TIMEOUT: begin\n"); printk("TX_TIMEOUT: begin\n");
// (struct nas_priv *)(dev->priv)->stats.tx_errors++; // (struct nas_priv *)(dev->priv)->stats.tx_errors++;
(priv->stats).tx_errors++; (priv->stats).tx_errors++;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) || (defined RHEL_RELEASE_CODE && RHEL_RELEASE_CODE>=1796) #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
netif_trans_update(dev); netif_trans_update(dev);
#else #else
dev->trans_start = jiffies; dev->trans_start = jiffies;
@@ -285,7 +285,7 @@ static const struct net_device_ops nasmesh_netdev_ops = {
.ndo_set_mac_address = NULL, .ndo_set_mac_address = NULL,
.ndo_set_config = nas_set_config, .ndo_set_config = nas_set_config,
.ndo_do_ioctl = nas_CTL_ioctl, .ndo_do_ioctl = nas_CTL_ioctl,
#if (defined RHEL_RELEASE_CODE && RHEL_RELEASE_CODE>=1797 && LINUX_VERSION_CODE <= KERNEL_VERSION(3,11,0)) #if LINUX_VERSION_CODE <= KERNEL_VERSION(3,11,0)
.extended.ndo_change_mtu = nas_change_mtu, .extended.ndo_change_mtu = nas_change_mtu,
#else #else
.ndo_change_mtu = nas_change_mtu, .ndo_change_mtu = nas_change_mtu,
openair2/NETWORK_DRIVER/UE_IP/device.c
+2 -6
View File
@@ -239,7 +239,7 @@ int ue_ip_hard_start_xmit(struct sk_buff *skb_pP, struct net_device *dev_pP) {
// End debug information // End debug information
netif_stop_queue(dev_pP); netif_stop_queue(dev_pP);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) || (defined RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= 1796) #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
netif_trans_update(dev_pP); netif_trans_update(dev_pP);
#else #else
dev_pP->trans_start = jiffies; dev_pP->trans_start = jiffies;
@@ -315,7 +315,7 @@ void ue_ip_tx_timeout(struct net_device *dev_pP)
printk("[UE_IP_DRV][%s] begin\n", __FUNCTION__); printk("[UE_IP_DRV][%s] begin\n", __FUNCTION__);
// (ue_ip_priv_t *)(dev_pP->priv_p)->stats.tx_errors++; // (ue_ip_priv_t *)(dev_pP->priv_p)->stats.tx_errors++;
(priv_p->stats).tx_errors++; (priv_p->stats).tx_errors++;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) || (defined RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= 1796) #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
netif_trans_update(dev_pP); netif_trans_update(dev_pP);
#else #else
dev_pP->trans_start = jiffies; dev_pP->trans_start = jiffies;
@@ -333,11 +333,7 @@ static const struct net_device_ops ue_ip_netdev_ops = {
.ndo_set_mac_address = ue_ip_set_mac_address, .ndo_set_mac_address = ue_ip_set_mac_address,
.ndo_set_config = ue_ip_set_config, .ndo_set_config = ue_ip_set_config,
.ndo_do_ioctl = NULL, .ndo_do_ioctl = NULL,
#if (defined RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= 1797)
.extended.ndo_change_mtu = ue_ip_change_mtu,
#else
.ndo_change_mtu = ue_ip_change_mtu, .ndo_change_mtu = ue_ip_change_mtu,
#endif
.ndo_tx_timeout = ue_ip_tx_timeout, .ndo_tx_timeout = ue_ip_tx_timeout,
.ndo_change_rx_flags = ue_ip_change_rx_flags, .ndo_change_rx_flags = ue_ip_change_rx_flags,
}; };