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

Merge remote-tracking branch 'origin/nasmesh_kernel_5.8' into integration_2021_wk06_b

Browse Source
This commit is contained in:
hardy
2021-02-09 10:48:57 +01:00
parent 403db5f66e 6add9968a8
commit bcc009b2f9
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/NETWORK_DRIVER/LITE/device.c
+4
View File
@@ -316,7 +316,11 @@ void oai_nw_drv_change_rx_flags(struct net_device *dev, int flags)
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)
void oai_nw_drv_tx_timeout(struct net_device *dev, unsigned int txqueue)
#else
void oai_nw_drv_tx_timeout(struct net_device *dev) void oai_nw_drv_tx_timeout(struct net_device *dev)
#endif
{ {
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Transmitter timeout, serious problems. // Transmitter timeout, serious problems.
openair2/NETWORK_DRIVER/MESH/device.c
+3 -3
View File
@@ -297,10 +297,10 @@ int nas_change_mtu(struct net_device *dev, int mtu)
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#if LINUX_VERSION_CODE < KERNEL_VERSION(5,7,0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)
void nas_tx_timeout(struct net_device *dev) void nas_tx_timeout(struct net_device *dev, unsigned int txqueue)
#else #else
void nas_tx_timeout(struct net_device *dev, unsigned int x) void nas_tx_timeout(struct net_device *dev)
#endif #endif
{ {
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
openair2/NETWORK_DRIVER/UE_IP/device.c
+6 -1
View File
@@ -302,7 +302,12 @@ void ue_ip_change_rx_flags(struct net_device *dev_pP, int flagsP) {
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void ue_ip_tx_timeout(struct net_device *dev_pP) { #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)
void ue_ip_tx_timeout(struct net_device *dev_pP, unsigned int txqueue)
#else
void ue_ip_tx_timeout(struct net_device *dev_pP)
#endif
{
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Transmitter timeout, serious problems. // Transmitter timeout, serious problems.
ue_ip_priv_t *priv_p = netdev_priv(dev_pP); ue_ip_priv_t *priv_p = netdev_priv(dev_pP);