aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--device.mk3
-rw-r--r--proprietary-files.txt1
-rwxr-xr-xrootdir/etc/init.qcom.rc27
-rw-r--r--wifi/fstman.ini24
4 files changed, 1 insertions, 54 deletions
diff --git a/device.mk b/device.mk
index 6a24852..6dfbba2 100644
--- a/device.mk
+++ b/device.mk
@@ -260,8 +260,7 @@ PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/wifi/hostapd_default.conf:system/etc/hostapd/hostapd_default.conf \
$(LOCAL_PATH)/wifi/hostapd.deny:system/etc/hostapd/hostapd.deny \
$(LOCAL_PATH)/wifi/p2p_supplicant_overlay.conf:system/etc/wifi/p2p_supplicant_overlay.conf \
- $(LOCAL_PATH)/wifi/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf \
- $(LOCAL_PATH)/wifi/fstman.ini:system/etc/wifi/fstman.ini
+ $(LOCAL_PATH)/wifi/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/wifi/WCNSS_qcom_cfg.ini:system/etc/wifi/WCNSS_qcom_cfg.ini \
diff --git a/proprietary-files.txt b/proprietary-files.txt
index b1fe13d..5d0f345 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -535,7 +535,6 @@ bin/pm-service
bin/hci_qcomm_init
bin/port-bridge
bin/time_daemon
-bin/cnss_diag
bin/cnss-daemon
bin/imscmservice
bin/loc_launcher
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index bbc3020..6b52d03 100755
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -318,9 +318,6 @@ on boot
# Allow access for CCID command/response timeout configuration
chown system system /sys/module/ccid_bridge/parameters/bulk_msg_timeout
- # bond0 used by FST Manager
- chown wifi wifi /sys/class/net/bond0/bonding/queue_id
-
# change this when HAL3 is working
setprop persist.camera.HAL3.enabled 0
@@ -1030,20 +1027,6 @@ service wigig_supplicant /system/bin/wpa_supplicant \
disabled
oneshot
-# FST Manager with hostapd (softap) - all settings inside ini file
-service fstman /system/bin/fstman -B -ddd -c /data/misc/wifi/fstman.ini
- user wifi
- group wifi net_admin net_raw
- class main
- disabled
- oneshot
-
-on property:netd.fstman.start=true
- start fstman
-
-on property:netd.fstman.start=false
- stop fstman
-
service ptt_socket_app /system/bin/ptt_socket_app -d
class main
user root
@@ -1066,16 +1049,6 @@ service wifi_fccutild /system/bin/wifi_fccutild
on property:wifi.fccutild.load.qcacld=true
insmod /system/lib/modules/qca_cld/qca_cld_wlan.ko con_mode=5
-service cnss_diag /system/bin/cnss_diag -q -f
- class main
- user root
- group root
- #ifdef VENDOR_EDIT
- # cnss diag cause power consumption bigger sometimes, so disable it until solve it
- disabled
- #endif
- oneshot
-
service cnss-daemon /system/bin/cnss-daemon -n -l
class late_start
diff --git a/wifi/fstman.ini b/wifi/fstman.ini
deleted file mode 100644
index e11b81d..0000000
--- a/wifi/fstman.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-[fst_manager]
-ctrl_iface=/data/misc/wifi/hostapd/global
-groups=bond0
-
-[bond0]
-interfaces=wlan0,wlan1
-mux_type=bonding
-mux_ifname=bond0
-mux_managed=1
-mac_address_by=wlan0
-rate_upgrade_master=wlan0
-txqueuelen=100
-rate_upgrade_acl_file=/data/misc/wifi/fst_rate_upgrade.accept
-
-[wlan0]
-priority=100
-default_llt=3600
-
-[wlan1]
-priority=110
-wpa_group=GCMP
-wpa_pairwise=GCMP
-hw_mode=ad
-channel=2