diff --git a/Makefile b/Makefile
index b79a7d8..70c609a 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ EXTRA_CFLAGS += -Wno-unused-function
 EXTRA_CFLAGS += -Wno-unused
 
 EXTRA_CFLAGS += -Wno-uninitialized
+EXTRA_CFLAGS += -Wno-int-to-pointer-cast
 
 EXTRA_CFLAGS += -I$(src)/include
 
diff --git a/os_dep/linux/ioctl_linux.c b/os_dep/linux/ioctl_linux.c
index 43083ee..f821f5d 100644
--- a/os_dep/linux/ioctl_linux.c
+++ b/os_dep/linux/ioctl_linux.c
@@ -8876,13 +8876,13 @@ static int rtw_mp_efuse_get(struct net_device *dev,
 		{
 //			DBG_871X("0x%02x\t", i);
 			sprintf(extra, "%s0x%02x\t", extra, i);
-			for (j=0; j<8; j++) {
+			for (j=0; j<8 && i+j<EFUSE_MAX_MAP_LEN; j++) {
 //				DBG_871X("%02X ", data[i+j]);
 				sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeEfuseInitMap[i+j]);
 			}
 //			DBG_871X("\t");
 			sprintf(extra, "%s\t", extra);
-			for (; j<16; j++) {
+			for (; j<16 && i+j<EFUSE_MAX_MAP_LEN; j++) {
 //				DBG_871X("%02X ", data[i+j]);
 				sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeEfuseInitMap[i+j]);
 			}
@@ -9296,13 +9296,13 @@ static int rtw_mp_efuse_get(struct net_device *dev,
 		{
 //			DBG_871X("\t0x%02x\t", i);
 			sprintf(extra, "%s0x%02x\t", extra, i);
-			for (j=0; j<8; j++) {
+			for (j=0; j<8 && i+j<EFUSE_MAX_MAP_LEN; j++) {
 //				DBG_871X("%02X ", pEfuseHal->fakeEfuseModifiedMap[i+j]);
 				sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeEfuseModifiedMap[i+j]);
 			}
 //			DBG_871X("\t");
 			sprintf(extra, "%s\t", extra);
-			for (; j<16; j++) {
+			for (; j<16 && i+j<EFUSE_MAX_MAP_LEN; j++) {
 //				DBG_871X("%02X ", pEfuseHal->fakeEfuseModifiedMap[i+j]);
 				sprintf(extra, "%s %02X", extra, pEfuseHal->fakeEfuseModifiedMap[i+j]);
 			}
diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c
index 3f61fdb..2fe06a7 100644
--- a/os_dep/linux/os_intfs.c
+++ b/os_dep/linux/os_intfs.c
@@ -999,7 +999,7 @@ unsigned int rtw_classify8021d(struct sk_buff *skb)
 	return dscp >> 5;
 }
 
-static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb)
+static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb, void *accel_priv, select_queue_fallback_t fallback)
 {
 	_adapter	*padapter = rtw_netdev_priv(dev);
 	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
diff --git a/os_dep/linux/rtw_android.c b/os_dep/linux/rtw_android.c
index fd41743..d56c2ec 100644
--- a/os_dep/linux/rtw_android.c
+++ b/os_dep/linux/rtw_android.c
@@ -549,7 +549,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
 	
 		pwfd_info = &padapter->wfd_info;
 		if( padapter->wdinfo.driver_interface == DRIVER_CFG80211 )
-			pwfd_info->rtsp_ctrlport = ( u16 ) get_int_from_command( priv_cmd.buf );
+			pwfd_info->rtsp_ctrlport = ( u16 ) get_int_from_command( (char*)priv_cmd.buf );
 		break;
 	}
 	case ANDROID_WIFI_CMD_WFD_SET_MAX_TPUT:
@@ -569,7 +569,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
 		pwfd_info = &padapter->wfd_info;
 		if( padapter->wdinfo.driver_interface == DRIVER_CFG80211 )
 		{
-			pwfd_info->wfd_device_type = ( u8 ) get_int_from_command( priv_cmd.buf );
+			pwfd_info->wfd_device_type = ( u8 ) get_int_from_command( (char*)priv_cmd.buf );
 		
 			pwfd_info->wfd_device_type &= WFD_DEVINFO_DUAL;
 		}