This commit is contained in:
tianshaoshuai 2024-09-05 16:38:27 +08:00 committed by openkylin-cibot
parent 13c6e95950
commit d54fa4b149
2 changed files with 66 additions and 0 deletions

65
debian/patches/0031-111.patch vendored Normal file
View File

@ -0,0 +1,65 @@
From: tianshaoshuai <tianshaoshuai@kylinos.cn>
Date: Thu, 5 Sep 2024 16:38:27 +0800
Subject: 111
---
src/hardware/libkync.c | 22 ++++++++++------------
src/hardware/libkyusb.c | 2 +-
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/hardware/libkync.c b/src/hardware/libkync.c
index 46b9996..107fa1e 100644
--- a/src/hardware/libkync.c
+++ b/src/hardware/libkync.c
@@ -22,28 +22,26 @@
#define _GNU_SOURCE # required for NI_NUMERICHOST
#include "libkync.h"
-#include <cstring-extension.h>
-#include <errno.h>
-#include <kerr.h>
-#include <libkylog.h>
+#include "cstring-extension.h"
+#include "kerr.h"
+#include "libkylog.h"
+#include "sdkmarcos.h"
+
#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
#include <string.h>
-#include <kysdk/kysdk-base/sdkmarcos.h>
+#include <dirent.h>
+#include <glib.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
-// #include <linux/if.h>
-#include <unistd.h>
+#include <net/if.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
#include <ifaddrs.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <glib.h>
#include <linux/sockios.h>
#include <linux/ethtool.h>
-// #include <net/if_arp.h>
-#include <net/if.h>
#include <linux/wireless.h>
#include <libnl3/netlink/netlink.h>
diff --git a/src/hardware/libkyusb.c b/src/hardware/libkyusb.c
index 64735c2..558cd60 100644
--- a/src/hardware/libkyusb.c
+++ b/src/hardware/libkyusb.c
@@ -838,7 +838,7 @@ void kdk_usb_free_usb_info(pUsbInfo list)
return;
while (list)
{
- pUsbInfo* tmp = list;
+ pUsbInfo tmp = list;
list = list->next;
free(tmp);
}

View File

@ -28,3 +28,4 @@
0028-111.patch
0029-111.patch
0030-111.patch
0031-111.patch