AX88772C_eeprom and ax8872c build together

hc

2024-05-16 8d2a02b24d66aa359e83eebc1ed3c0f85367a1cb

 kernel/drivers/net/wireless/rockchip_wlan/rtl8723cs/os_dep/linux/os_intfs.c
..
..
@@ -499,12 +499,6 @@
499
499
 module_param(if2name, charp, 0644);
500
500
 MODULE_PARM_DESC(if2name, "The default name to allocate for second interface");
501
501
 
502
-#if defined(CONFIG_PLATFORM_ANDROID) && (CONFIG_IFACE_NUMBER > 2)
503
-char *if3name = "ap%d";
504
-module_param(if3name, charp, 0644);
505
-MODULE_PARM_DESC(if3name, "The default name to allocate for third interface");
506
-#endif
507
-
508
502
 char *rtw_initmac = 0;  /* temp mac address if users want to use instead of the mac address in Efuse */
509
503
 
510
504
 #ifdef CONFIG_CONCURRENT_MODE
..
..
@@ -694,10 +688,6 @@
694
688
 module_param(rtw_dfs_region_domain, uint, 0644);
695
689
 MODULE_PARM_DESC(rtw_dfs_region_domain, "0:NONE, 1:FCC, 2:MKK, 3:ETSI");
696
690
 #endif
697
-
698
-uint rtw_amsdu_mode = RTW_AMSDU_MODE;
699
-module_param(rtw_amsdu_mode, uint, 0644);
700
-MODULE_PARM_DESC(rtw_amsdu_mode, "0:non-spp, 1:spp, 2:all drop");
701
691
 
702
692
 uint rtw_amplifier_type_2g = CONFIG_RTW_AMPLIFIER_TYPE_2G;
703
693
 module_param(rtw_amplifier_type_2g, uint, 0644);
..
..
@@ -1391,9 +1381,7 @@
1391
1381
 
1392
1382
 	snprintf(registry_par->ifname, 16, "%s", ifname);
1393
1383
 	snprintf(registry_par->if2name, 16, "%s", if2name);
1394
-#if defined(CONFIG_PLATFORM_ANDROID) && (CONFIG_IFACE_NUMBER > 2)
1395
-	snprintf(registry_par->if3name, 16, "%s", if3name);
1396
-#endif
1384
+
1397
1385
 	registry_par->notch_filter = (u8)rtw_notch_filter;
1398
1386
 
1399
1387
 #ifdef CONFIG_CONCURRENT_MODE
..
..
@@ -1471,8 +1459,6 @@
1471
1459
 	}
1472
1460
 	#endif
1473
1461
 #endif
1474
-
1475
-	registry_par->amsdu_mode = (u8)rtw_amsdu_mode;
1476
1462
 
1477
1463
 #ifdef CONFIG_MCC_MODE
1478
1464
 	registry_par->en_mcc = (u8)rtw_en_mcc;
..
..
@@ -3732,10 +3718,6 @@
3732
3718
 				name = regsty->ifname;
3733
3719
 			else if (adapter->iface_id == IFACE_ID1)
3734
3720
 				name = regsty->if2name;
3735
-#if defined(CONFIG_PLATFORM_ANDROID) && (CONFIG_IFACE_NUMBER > 2)
3736
-			else if (adapter->iface_id == IFACE_ID2)
3737
-				name = regsty->if3name;
3738
-#endif
3739
3721
 			else
3740
3722
 				name = "wlan%d";
3741
3723