add stmac read mac form eeprom

hc

2023-12-09 b22da3d8526a935aa31e086e63f60ff3246cb61c

 kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_sdio.c
..
..
@@ -69,7 +69,6 @@
69
69
 #include <dhd_dbg.h>
70
70
 #include <dhdioctl.h>
71
71
 #include <sdiovar.h>
72
-#include <wl_android.h>
73
72
 #include <dhd_config.h>
74
73
 #ifdef DHD_PKTDUMP_TOFW
75
74
 #include <dhd_linux_pktdump.h>
..
..
@@ -1201,7 +1200,7 @@
1201
1200
 	int err = 0;
1202
1201
 	int try_cnt = 0, try_max = CUSTOM_MAX_KSO_ATTEMPTS;
1203
1202
 	struct dhd_conf *conf = bus->dhd->conf;
1204
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)) && !defined(ANDROID13_KERNEL515_BKPORT)
1203
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0))
1205
1204
 	wifi_adapter_info_t *adapter = NULL;
1206
1205
 	uint32 bus_type = -1, bus_num = -1, slot_num = -1;
1207
1206
 #else
..
..
@@ -1212,7 +1211,7 @@
1212
1211
 
1213
1212
 	KSO_DBG(("%s> op:%s\n", __FUNCTION__, (on ? "KSO_SET" : "KSO_CLR")));
1214
1213
 
1215
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)) && !defined(ANDROID13_KERNEL515_BKPORT)
1214
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0))
1216
1215
 	dhd_bus_get_ids(bus, &bus_type, &bus_num, &slot_num);
1217
1216
 	adapter = dhd_wifi_platform_get_adapter(bus_type, bus_num, slot_num);
1218
1217
 	sdio_retune_crc_disable(adapter->sdio_func);
..
..
@@ -1344,7 +1343,7 @@
1344
1343
 #endif /* !defined(NDIS) */
1345
1344
 
1346
1345
 exit:
1347
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)) && !defined(ANDROID13_KERNEL515_BKPORT)
1346
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0))
1348
1347
 	if (on)
1349
1348
 		sdio_retune_release(adapter->sdio_func);
1350
1349
 	sdio_retune_crc_enable(adapter->sdio_func);
..
..
@@ -1980,9 +1979,6 @@
1980
1979
 #if defined(BCMSDIOH_STD)
1981
1980
 	uint32 sd3_tuning_disable = FALSE;
1982
1981
 #endif /* BCMSDIOH_STD */
1983
-#if defined(WL_EXT_IAPSTA) && defined(DHD_LOSSLESS_ROAMING)
1984
-	int state;
1985
-#endif /* WL_EXT_IAPSTA && DHD_LOSSLESS_ROAMING */
1986
1982
 
1987
1983
 	DHD_INFO(("dhdsdio_bussleep: request %s (currently %s)\n",
1988
1984
 	         (sleep ? "SLEEP" : "WAKE"),
..
..
@@ -2005,14 +2001,6 @@
2005
2001
 		if (bus->dpc_sched || bus->rxskip || pktq_n_pkts_tot(&bus->txq))
2006
2002
 #endif /* DHD_USE_IDLECOUNT */
2007
2003
 			return BCME_BUSY;
2008
-#if defined(WL_EXT_IAPSTA) && defined(DHD_LOSSLESS_ROAMING)
2009
-		state = wl_ext_any_sta_handshaking(bus->dhd);
2010
-		if (state) {
2011
-			if (dump_msg_level & DUMP_EAPOL_VAL)
2012
-				DHD_ERROR(("handshaking %d\n", state));
2013
-			return BCME_BUSY;
2014
-		}
2015
-#endif /* WL_EXT_IAPSTA && DHD_LOSSLESS_ROAMING */
2016
2004
 
2017
2005
 #ifdef BT_OVER_SDIO
2018
2006
 		/*
..
..
@@ -2741,7 +2729,7 @@
2741
2729
 	/* restore pkt buffer pointer, but keeps the header pushed by dhd_prot_hdrpush */
2742
2730
 	frame = (uint8*)PKTDATA(osh, pkt);
2743
2731
 
2744
-	DHD_INFO(("%s PKTLEN before postprocess %d\n",
2732
+	DHD_INFO(("%s PKTLEN before postprocess %d",
2745
2733
 		__FUNCTION__, PKTLEN(osh, pkt)));
2746
2734
 
2747
2735
 	/* PKTLEN still includes tail_padding, so exclude it.
..
..
@@ -8065,11 +8053,7 @@
8065
8053
 	} else if (bus->clkstate == CLK_PENDING) {
8066
8054
 		/* Awaiting I_CHIPACTIVE; don't resched */
8067
8055
 	} else if (bus->intstatus || bus->ipend ||
8068
-			(!bus->fcstate && (pktq_mlen(&bus->txq, ((~bus->flowcontrol)
8069
-#ifdef DHD_LOSSLESS_ROAMING
8070
-			& bus->dhd->dequeue_prec_map
8071
-#endif /* DHD_LOSSLESS_ROAMING */
8072
-			))) && DATAOK(bus)) ||
8056
+			(!bus->fcstate && pktq_mlen(&bus->txq, ~bus->flowcontrol) && DATAOK(bus)) ||
8073
8057
 			PKT_AVAILABLE(bus, bus->intstatus)) {  /* Read multiple frames */
8074
8058
 		resched = TRUE;
8075
8059
 	}