浏览代码

Merge pull request #166 from AlShu/ubuntu_v19.04

linux kernel 5.x. Ubuntu 19.04
Ole Petter Bang 6 年之前
父节点
当前提交
f8c8954d7c
共有 2 个文件被更改,包括 6 次插入3 次删除
  1. 3 0
      Makefile
  2. 3 3
      os_dep/linux/rtw_android.c

+ 3 - 0
Makefile

@@ -14,6 +14,9 @@ EXTRA_CFLAGS += -Wno-unused-parameter
 EXTRA_CFLAGS += -Wno-unused-function
 EXTRA_CFLAGS += -Wno-unused
 
+EXTRA_CFLAGS += -Wno-incompatible-pointer-types
+EXTRA_CFLAGS += -Wno-implicit-function-declaration
+
 EXTRA_CFLAGS += -Wno-uninitialized
 EXTRA_CFLAGS += -Wno-int-to-pointer-cast
 EXTRA_CFLAGS += -Wno-vla

+ 3 - 3
os_dep/linux/rtw_android.c

@@ -353,14 +353,14 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
 	}
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(5,0,0))
-    if (!access_ok(VERIFY_READ, priv_cmd.buf, priv_cmd.total_len)){
+  if (!access_ok(VERIFY_READ, priv_cmd.buf, priv_cmd.total_len)) {
 #else
-    if (!access_ok(priv_cmd.buf, priv_cmd.total_len)){
+  if (!access_ok(priv_cmd.buf, priv_cmd.total_len)) {
 #endif
 	 	DBG_871X("%s: failed to access memory\n", __FUNCTION__);
 		ret = -EFAULT;
 		goto exit;
-	 }
+	}
 	if (copy_from_user(command, (void *)priv_cmd.buf, priv_cmd.total_len)) {
 		ret = -EFAULT;
 		goto exit;