From e9fa7caa6ccf06ef1755724f54a326de2241e288 Mon Sep 17 00:00:00 2001 From: Paolo Date: Tue, 31 Jan 2023 17:39:26 +0100 Subject: [PATCH] sunxi64: fix uwe5622 compile on current 5.15 kernel (#4772) --- .../compilation/patch/drivers_network.sh | 1 - .../wireless-driver-for-uwe5622-warnings.patch | 16 ---------------- 2 files changed, 17 deletions(-) diff --git a/lib/functions/compilation/patch/drivers_network.sh b/lib/functions/compilation/patch/drivers_network.sh index 2d72759cb..92467972d 100644 --- a/lib/functions/compilation/patch/drivers_network.sh +++ b/lib/functions/compilation/patch/drivers_network.sh @@ -534,7 +534,6 @@ driver_uwe5622_allwinner() if linux-version compare "${version}" lt 6.1; then process_patch_file "${SRC}/patch/misc/wireless-driver-for-uwe5622-park-link-pre-v6.1.patch" "applying" - process_patch_file "${SRC}/patch/misc/wireless-driver-for-uwe5622-allwinner-bt-fix.patch" "applying" fi if linux-version compare "${version}" ge 6.1; then diff --git a/patch/misc/wireless-driver-for-uwe5622-warnings.patch b/patch/misc/wireless-driver-for-uwe5622-warnings.patch index 41f5eb530..809b2e743 100644 --- a/patch/misc/wireless-driver-for-uwe5622-warnings.patch +++ b/patch/misc/wireless-driver-for-uwe5622-warnings.patch @@ -181,22 +181,6 @@ index b426bf89cd9..8000bfea378 100755 if ((tp_tx_buf_cnt <= TP_TX_BUF_CNT) && (tp_tx_buf_len <= TP_TX_BUF_LEN)) { sprdwcn_bus_chn_deinit(&at_tx_ops); -diff --git a/drivers/net/wireless/uwe5622/unisocwifi/cfg80211.c b/drivers/net/wireless/uwe5622/unisocwifi/cfg80211.c -index 5d86a5cc435..f26113c08af 100755 ---- a/drivers/net/wireless/uwe5622/unisocwifi/cfg80211.c -+++ b/drivers/net/wireless/uwe5622/unisocwifi/cfg80211.c -@@ -1747,10 +1747,6 @@ static int sprdwl_cfg80211_disconnect(struct wiphy *wiphy, - struct sprdwl_vif *vif = netdev_priv(ndev); - enum sm_state old_state = vif->sm_state; - int ret; --#ifdef SYNC_DISCONNECT -- u32 msec; -- ktime_t kt; --#endif - #ifdef STA_SOFTAP_SCC_MODE - struct sprdwl_intf *intf = (struct sprdwl_intf *)vif->priv->hw_priv; - intf->sta_home_channel = 0; - diff --git a/drivers/net/wireless/uwe5622/unisocwifi/wl_core.c b/drivers/net/wireless/uwe5622/unisocwifi/wl_core.c index ad310450e79..206824604ec 100755 --- a/drivers/net/wireless/uwe5622/unisocwifi/wl_core.c