Merge pull request #108 from CGarces/backport_fs

Backport rtl8189fs improvements
jwrdegoede · Jan 21, 2024 · eb51e02 · eb51e02
2 parents fbd57a1 + fbf2119
commit eb51e02
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -20,7 +20,7 @@ EXTRA_CFLAGS += -Wno-date-time	# Fix compile error && warning on gcc 4.9 and lat
 endif
 
 EXTRA_CFLAGS += -I$(src)/include
-
+EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
 EXTRA_LDFLAGS += --strip-debug
 
 CONFIG_AUTOCFG_CP = n

diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
@@ -430,7 +430,7 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset, u8
 	u8 ret = _SUCCESS;
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
-	struct cfg80211_chan_def chdef;
+	struct cfg80211_chan_def chdef = {};
 
 	if (!rtw_cfg80211_allow_ch_switch_notify(adapter))
 		goto exit;

diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c
@@ -3145,7 +3145,7 @@ _adapter *rtw_drv_add_vir_if(_adapter *primary_padapter,
 	* If it is 1, the address is locally administered
 	*/
 	mac[0] |= BIT(1);
-	if (padapter->iface_id > IFACE_ID1)
+	if (padapter->iface_id >= IFACE_ID1)
 		mac[4] ^= BIT(padapter->iface_id);
 
 	_rtw_memcpy(adapter_mac_addr(padapter), mac, ETH_ALEN);