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

openair2/NETWORK_DRIVER/LITE/device.c

@@ -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)
+#endif
 {
   //---------------------------------------------------------------------------
   // Transmitter timeout, serious problems.

openair2/NETWORK_DRIVER/MESH/device.c

@@ -297,10 +297,10 @@ int nas_change_mtu(struct net_device *dev, int mtu)
 }
 
 //---------------------------------------------------------------------------
-#if  LINUX_VERSION_CODE < KERNEL_VERSION(5,7,0)
-void nas_tx_timeout(struct net_device *dev)
+#if  LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)
+void nas_tx_timeout(struct net_device *dev, unsigned int txqueue)
 #else
-void nas_tx_timeout(struct net_device *dev, unsigned int x)
+void nas_tx_timeout(struct net_device *dev)
 #endif
 {
   //---------------------------------------------------------------------------

openair2/NETWORK_DRIVER/UE_IP/device.c

@@ -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.
   ue_ip_priv_t *priv_p =  netdev_priv(dev_pP);