From bedbef8ad3e75a304af6361af235302bcc61d06b Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Tue, 14 May 2024 06:39:01 +0000
Subject: [PATCH] 修改内核路径
---
kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_sdio.c | 25 +++++--------------------
1 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_sdio.c b/kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_sdio.c
index 1c46920..ed5c314 100644
--- a/kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_sdio.c
+++ b/kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_sdio.c
@@ -69,7 +69,6 @@
#include <dhd_dbg.h>
#include <dhdioctl.h>
#include <sdiovar.h>
-#include <wl_android.h>
#include <dhd_config.h>
#ifdef DHD_PKTDUMP_TOFW
#include <dhd_linux_pktdump.h>
@@ -1201,7 +1200,7 @@
int err = 0;
int try_cnt = 0, try_max = CUSTOM_MAX_KSO_ATTEMPTS;
struct dhd_conf *conf = bus->dhd->conf;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)) && !defined(ANDROID13_KERNEL515_BKPORT)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0))
wifi_adapter_info_t *adapter = NULL;
uint32 bus_type = -1, bus_num = -1, slot_num = -1;
#else
@@ -1212,7 +1211,7 @@
KSO_DBG(("%s> op:%s\n", __FUNCTION__, (on ? "KSO_SET" : "KSO_CLR")));
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)) && !defined(ANDROID13_KERNEL515_BKPORT)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0))
dhd_bus_get_ids(bus, &bus_type, &bus_num, &slot_num);
adapter = dhd_wifi_platform_get_adapter(bus_type, bus_num, slot_num);
sdio_retune_crc_disable(adapter->sdio_func);
@@ -1344,7 +1343,7 @@
#endif /* !defined(NDIS) */
exit:
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)) && !defined(ANDROID13_KERNEL515_BKPORT)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0))
if (on)
sdio_retune_release(adapter->sdio_func);
sdio_retune_crc_enable(adapter->sdio_func);
@@ -1980,9 +1979,6 @@
#if defined(BCMSDIOH_STD)
uint32 sd3_tuning_disable = FALSE;
#endif /* BCMSDIOH_STD */
-#if defined(WL_EXT_IAPSTA) && defined(DHD_LOSSLESS_ROAMING)
- int state;
-#endif /* WL_EXT_IAPSTA && DHD_LOSSLESS_ROAMING */
DHD_INFO(("dhdsdio_bussleep: request %s (currently %s)\n",
(sleep ? "SLEEP" : "WAKE"),
@@ -2005,13 +2001,6 @@
if (bus->dpc_sched || bus->rxskip || pktq_n_pkts_tot(&bus->txq))
#endif /* DHD_USE_IDLECOUNT */
return BCME_BUSY;
-#if defined(WL_EXT_IAPSTA) && defined(DHD_LOSSLESS_ROAMING)
- state = wl_ext_any_sta_handshaking(bus->dhd);
- if (state) {
- DHD_ERROR(("handshaking %d\n", state));
- return BCME_BUSY;
- }
-#endif /* WL_EXT_IAPSTA && DHD_LOSSLESS_ROAMING */
#ifdef BT_OVER_SDIO
/*
@@ -2740,7 +2729,7 @@
/* restore pkt buffer pointer, but keeps the header pushed by dhd_prot_hdrpush */
frame = (uint8*)PKTDATA(osh, pkt);
- DHD_INFO(("%s PKTLEN before postprocess %d\n",
+ DHD_INFO(("%s PKTLEN before postprocess %d",
__FUNCTION__, PKTLEN(osh, pkt)));
/* PKTLEN still includes tail_padding, so exclude it.
@@ -8064,11 +8053,7 @@
} else if (bus->clkstate == CLK_PENDING) {
/* Awaiting I_CHIPACTIVE; don't resched */
} else if (bus->intstatus || bus->ipend ||
- (!bus->fcstate && (pktq_mlen(&bus->txq, ((~bus->flowcontrol)
-#ifdef DHD_LOSSLESS_ROAMING
- & bus->dhd->dequeue_prec_map
-#endif /* DHD_LOSSLESS_ROAMING */
- ))) && DATAOK(bus)) ||
+ (!bus->fcstate && pktq_mlen(&bus->txq, ~bus->flowcontrol) && DATAOK(bus)) ||
PKT_AVAILABLE(bus, bus->intstatus)) { /* Read multiple frames */
resched = TRUE;
}
--
Gitblit v1.6.2