diff --git a/SD_ROOT/wz_mini/etc/init.d/wz_user.sh b/SD_ROOT/wz_mini/etc/init.d/wz_user.sh index 29448ed..2e65533 100755 --- a/SD_ROOT/wz_mini/etc/init.d/wz_user.sh +++ b/SD_ROOT/wz_mini/etc/init.d/wz_user.sh @@ -125,7 +125,7 @@ eth_wlan_up() { # If running with Interface Bonding enabled, kill any existing # wpa_supplicant that might be running and spawn our own instead - if [[ "$BONDING_ENABLED" == "true" ]] && [[ "$ENABLE_USB_ETH" == "true" ]]; then + if [[ "$BONDING_ENABLED" == "true" ]] && ([[ "$ENABLE_USB_ETH" == "true" ]] || [[ "$ENABLE_USB_DIRECT" == "true" ]]); then /opt/wz_mini/bin/busybox killall wpa_supplicant wpa_supplicant -D nl80211 -i wlanold -c /tmp/wpa_supplicant.conf -B -s fi @@ -163,7 +163,7 @@ wlanold_check() { eth_wlan_up else echo "wlanold doesn't exist" - if [[ "$BONDING_ENABLED" == "true" ]] && [[ "$ENABLE_USB_ETH" == "true" ]]; then + if [[ "$BONDING_ENABLED" == "true" ]] && ([[ "$ENABLE_USB_ETH" == "true" ]] || [[ "$ENABLE_USB_DIRECT" == "true" ]]); then rename_interface_and_setup_bonding bond0 "$BONDING_PRIMARY_INTERFACE" "$BONDING_SECONDARY_INTERFACE" else rename_interface $1 @@ -340,6 +340,27 @@ if [[ "$ENABLE_USB_DIRECT" == "true" ]]; then sleep 1 + if [[ "$BONDING_ENABLED" == "true" ]]; then + if [[ "$BONDING_LINK_MONITORING_FREQ_MS" == "" ]]; then + "$BONDING_LINK_MONITORING_FREQ_MS" = "100" + fi + if [[ "$BONDING_DOWN_DELAY_MS" == "" ]]; then + "$BONDING_DOWN_DELAY_MS" = "5000" + fi + if [[ "$BONDING_UP_DELAY_MS" == "" ]]; then + "$BONDING_UP_DELAY_MS" = "5000" + fi + if [[ "$BONDING_PRIMARY_INTERFACE" == "" ]]; then + "$BONDING_PRIMARY_INTERFACE" = "usb0" + fi + if [[ "$BONDING_SECONDARY_INTERFACE" == "" ]]; then + "$BONDING_SECONDARY_INTERFACE" = "wlan0" + fi + + # Insert the bonding driver into the kernel + insmod $KMOD_PATH/kernel/drivers/net/bonding/bonding.ko mode=active-backup miimon="$BONDING_LINK_MONITORING_FREQ_MS" downdelay="$BONDING_DOWN_DELAY_MS" updelay="$BONDING_UP_DELAY_MS" primary="$BONDING_PRIMARY_INTERFACE" + fi + swap_enable #loop begin diff --git a/file.chk b/file.chk index 4e23906..13a8753 100644 --- a/file.chk +++ b/file.chk @@ -4,7 +4,7 @@ d41d8cd98f00b204e9800998ecf8427e SD_ROOT/wz_mini/mnt/.gitignore 34c6a4c3a941ff2becd9f487826d7692 SD_ROOT/wz_mini/etc/uvc.config ad7d1a2f9db3079617731b5854ce3b6a SD_ROOT/wz_mini/etc/init.d/wz_cam.sh 0774518c06d6ef8e7181d35f194777cc SD_ROOT/wz_mini/etc/init.d/wz_init.sh -04473a0de3ebbf562d253c5df3ddfdde SD_ROOT/wz_mini/etc/init.d/wz_user.sh +340c9fbdc17600ee6b6e21938ea2743c SD_ROOT/wz_mini/etc/init.d/wz_user.sh babb83cd8cdbd5af8639cfaecbca2d70 SD_ROOT/wz_mini/etc/init.d/wz_post.sh e3034eac02d8eda9902ca9cf89f0a586 SD_ROOT/wz_mini/etc/inittab 840aa9c26726201f7cffbf001bee193a SD_ROOT/wz_mini/etc/uvc_jxf22.config @@ -187,7 +187,7 @@ ccf8f3611141656ba5594771bec06202 SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan 14865a6e2e2df87a8362c6f20377a934 SD_ROOT/wz_mini/lib/libtinyalsa.so.2 bd383994491e4bdca81788c168feb2eb SD_ROOT/wz_mini/lib/libasound.so.2 f6f0d5a9ebd916de6bdb9695067809ae SD_ROOT/wz_mini/lib/libaudioProcess.so -aa102e670336c6bf165f1a9925d9d4fc SD_ROOT/wz_mini/wz_mini.conf +3b770635ddc35a61a6ba42f6b68070bc SD_ROOT/wz_mini/wz_mini.conf d41d8cd98f00b204e9800998ecf8427e SD_ROOT/wz_mini/tmp/.gitignore 00b99816217a740f5169709ef01eddf6 v2_install/compile_image.sh ff15869fe24297b9a5f75335a458a44f v2_install/fw_tool.sh