Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0ead1bd authored by Ramanasarvesh Sadula's avatar Ramanasarvesh Sadula Committed by Dundi Raviteja
Browse files

wlan: Skip storing time of last rx to migrate 4.14 kernel 

last_rx is not supported in 4.14 kernel, so skip
storing time of last rx for 4.14 kernel.

Change-Id: I63418cd8d3c6267cc78e540e72a5a13028770160
CRs-Fixed: 2696955
parent 588d4dbb

CORE/HDD/inc/wlan_hdd_main.h

+7 −0
Original line number Diff line number Diff line
@@ -2400,4 +2400,11 @@ bool hdd_is_cli_iface_up(hdd_context_t *hdd_ctx); 
 */

void wlan_hdd_free_cache_channels(hdd_context_t *hdd_ctx);



#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0))

static inline void hdd_fill_last_rx(hdd_adapter_t *adapter)

{

}

#else

void hdd_fill_last_rx(hdd_adapter_t *adapter);

#endif

#endif    // end #if !defined( WLAN_HDD_MAIN_H )

CORE/HDD/src/wlan_hdd_softap_tx_rx.c

+1 −1
Original line number Diff line number Diff line
@@ -1853,7 +1853,7 @@ VOS_STATUS hdd_softap_rx_packet_cbk( v_VOID_t *vosContext, 
                 "%s: Failure returning vos pkt", __func__);

   }

   

   pAdapter->dev->last_rx = jiffies;

   hdd_fill_last_rx(pAdapter);



   return status;   

}

CORE/HDD/src/wlan_hdd_tx_rx.c

+8 −2
Original line number Diff line number Diff line
@@ -2532,6 +2532,12 @@ static void hdd_mon_add_rx_radiotap_hdr (struct sk_buff *skb, 
    memcpy(skb_push(skb, rtap_len), &rtap_temp[0], rtap_len);

}



#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0))

void hdd_fill_last_rx(hdd_adapter_t *adapter)

{

    adapter->dev->last_rx = jiffies;

}

#endif



VOS_STATUS  hdd_rx_packet_monitor_cbk(v_VOID_t *vosContext,vos_pkt_t *pVosPacket, int conversion)

{
@@ -2626,7 +2632,7 @@ VOS_STATUS hdd_rx_packet_monitor_cbk(v_VOID_t *vosContext,vos_pkt_t *pVosPacket 
   {

      VOS_TRACE( VOS_MODULE_ID_HDD_DATA, VOS_TRACE_LEVEL_ERROR,"%s: Failure returning vos pkt", __func__);

   }

   pAdapter->dev->last_rx = jiffies;

   hdd_fill_last_rx(pAdapter);



return status;

}
@@ -2912,7 +2918,7 @@ VOS_STATUS hdd_rx_packet_cbk( v_VOID_t *vosContext, 
      VOS_TRACE( VOS_MODULE_ID_HDD_DATA, VOS_TRACE_LEVEL_ERROR,"%s: Failure returning vos pkt", __func__);

   }

   

   pAdapter->dev->last_rx = jiffies;

   hdd_fill_last_rx(pAdapter);



   return status;   

}