diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/hnd_pktq.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/hnd_pktq.c
index d619113b1a5c..a7d3f7e57c1e 100755
--- a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/hnd_pktq.c
+++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/hnd_pktq.c
@@ -573,6 +573,12 @@ pktq_mdeq(struct pktq *pq, uint prec_bmp, int *prec_out)
 
 	q->len--;
 
+        // terence 20150308: fix for non-null pointer of skb->prev sent from ndo_start_xmit
+        if (q->len == 0) {
+            q->head = NULL;
+            q->tail = NULL;
+        }
+
 	if (prec_out)
 		*prec_out = prec;
 
diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/rkversion.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/rkversion.c
index 31ad13445448..d0a21ea6109e 100755
--- a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/rkversion.c
+++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/rkversion.c
@@ -10,7 +10,7 @@
  */
 
 
-const char RKWIFI_DRV_VERSION[] = "5.20.WFD.OOB.64bit";
+const char RKWIFI_DRV_VERSION[] = "5.40.WFD.OOB.64bit";
 
 const char WIFI_MODULE_NAME[] = "";
 const char CONFIG_BCMDHD_FW_PATH[] = "";