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

Merge remote-tracking branch 'origin/support-fedora36' into integration_2022_wk25

Browse Source
This commit is contained in:
Robert Schmidt
2022-06-21 19:11:17 +02:00
parent 2c226b08f4 0fe98c25a2
commit fe7228daee
5 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake_targets/tools/build_helper
+1 -3
View File
@@ -109,6 +109,7 @@ check_supported_distribution() {
"ubuntu18.04") return 0 ;; "ubuntu18.04") return 0 ;;
"ubuntu16.04") return 0 ;; "ubuntu16.04") return 0 ;;
"fedora35") return 0 ;; "fedora35") return 0 ;;
"fedora36") return 0 ;;
"rhel7") return 0 ;; "rhel7") return 0 ;;
"rhel7.6") return 0 ;; "rhel7.6") return 0 ;;
"rhel7.7") return 0 ;; "rhel7.7") return 0 ;;
@@ -623,7 +624,6 @@ check_install_additional_tools (){
android-tools-adb \ android-tools-adb \
wvdial \ wvdial \
sshpass \ sshpass \
nscd \
bc \ bc \
ntp" ntp"
elif [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]]; then elif [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]]; then
@@ -648,7 +648,6 @@ check_install_additional_tools (){
wvdial \ wvdial \
numpy \ numpy \
sshpass \ sshpass \
nscd \
python2-paramiko \ python2-paramiko \
python-pyroute2 \ python-pyroute2 \
python-netifaces \ python-netifaces \
@@ -676,7 +675,6 @@ check_install_additional_tools (){
wvdial \ wvdial \
python-numpy \ python-numpy \
sshpass \ sshpass \
nscd \
python-paramiko \ python-paramiko \
python-pyroute2 \ python-pyroute2 \
python-netifaces \ python-netifaces \
openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
+1 -1
View File
@@ -41,7 +41,7 @@
#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 #if defined RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= 1796 && RHEL_RELEASE_CODE != 2403
#include <lapacke/lapacke_utils.h> #include <lapacke/lapacke_utils.h>
#include <lapacke/lapacke.h> #include <lapacke/lapacke.h>
#else #else
openair1/PHY/LTE_UE_TRANSPORT/linear_preprocessing_rec.c
+1 -1
View File
@@ -14,7 +14,7 @@ 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 #if defined RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= 1796 && RHEL_RELEASE_CODE != 2403
#include <lapacke/lapacke_utils.h> #include <lapacke/lapacke_utils.h>
#include <lapacke/lapacke.h> #include <lapacke/lapacke.h>
#else #else
openair2/NETWORK_DRIVER/MESH/device.c
+6 -3
View File
@@ -198,7 +198,8 @@ 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) \
|| (defined RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= 1796 && RHEL_RELEASE_CODE != 2403)
netif_trans_update(dev); netif_trans_update(dev);
#else #else
dev->trans_start = jiffies; dev->trans_start = jiffies;
@@ -267,7 +268,8 @@ 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) \
|| (defined RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= 1796 && RHEL_RELEASE_CODE != 2403)
netif_trans_update(dev); netif_trans_update(dev);
#else #else
dev->trans_start = jiffies; dev->trans_start = jiffies;
@@ -285,7 +287,8 @@ 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) \
|| (defined RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= 1797 && RHEL_RELEASE_CODE != 2403)
.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
+5 -3
View File
@@ -239,7 +239,8 @@ 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) \
|| (defined RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= 1796 && RHEL_RELEASE_CODE != 2403)
netif_trans_update(dev_pP); netif_trans_update(dev_pP);
#else #else
dev_pP->trans_start = jiffies; dev_pP->trans_start = jiffies;
@@ -315,7 +316,8 @@ 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) \
|| (defined RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= 1796 && RHEL_RELEASE_CODE != 2403)
netif_trans_update(dev_pP); netif_trans_update(dev_pP);
#else #else
dev_pP->trans_start = jiffies; dev_pP->trans_start = jiffies;
@@ -333,7 +335,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) #if defined RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= 1797 && RHEL_RELEASE_CODE != 2403
.extended.ndo_change_mtu = ue_ip_change_mtu, .extended.ndo_change_mtu = ue_ip_change_mtu,
#else #else
.ndo_change_mtu = ue_ip_change_mtu, .ndo_change_mtu = ue_ip_change_mtu,