@@ -1128,7 +1128,7 @@ sqm_disable(){
1128
1128
1129
1129
for i in $ifaces ; do
1130
1130
tc qdisc del dev $i root 2> /dev/null
1131
- tc qdisc del dev $i handle ffff: ingress 2> /dev/null
1131
+ tc qdisc del dev $i handle ffff: ingress 2> /dev/null
1132
1132
# FQ-CoDel is a safe alternative
1133
1133
# if this fails system default (probably none) will stay
1134
1134
tc qdisc add dev $i root fq_codel 2> /dev/null
@@ -1197,7 +1197,7 @@ sqm_enable(){
1197
1197
1198
1198
# Apply qdisc in categories
1199
1199
for i in $ppp_ifaces ; do
1200
- ifnq echo " Applying queue discipline to $i (ethernet interface)"
1200
+ ifnq echo " Applying queue discipline to $i (ethernet interface)"
1201
1201
1202
1202
restore_extra_arg=${extra_arg}
1203
1203
@@ -1218,7 +1218,7 @@ sqm_enable(){
1218
1218
tc qdisc add dev $i root cake ${diffserv} nat ${overhead} $extra_arg
1219
1219
ifnq echo " Applying queue discipline to $i (ppp interface)"
1220
1220
fi
1221
-
1221
+
1222
1222
ip link add name ifb$i type ifb 2> /dev/null
1223
1223
tc qdisc del dev $i ingress 2> /dev/null
1224
1224
tc qdisc add dev $i handle ffff: ingress 2> /dev/null
@@ -1230,11 +1230,11 @@ sqm_enable(){
1230
1230
overhead=" "
1231
1231
fi
1232
1232
1233
- if [[ " $sqm_wash_markings " == " true" ]]; then
1234
- wash=" wash"
1235
- else
1236
- wash=" "
1237
- fi
1233
+ if [[ " $sqm_wash_markings " == " true" ]]; then
1234
+ wash=" wash"
1235
+ else
1236
+ wash=" "
1237
+ fi
1238
1238
1239
1239
if [[ " $sqm_inet_download " != " " ]]; then
1240
1240
tc qdisc add dev ifb$i root cake ${diffserv} nat $wash bandwidth " $sqm_inet_download " mbit ${overhead} split-gso $extra_arg
@@ -1263,52 +1263,52 @@ sqm_enable(){
1263
1263
1264
1264
if ! chk_qdisc $i ; then
1265
1265
1266
- if [[ " $sqm_enable_ifb_on_ethernet " == " true" ]]; then
1266
+ if [[ " $sqm_enable_ifb_on_ethernet " == " true" ]]; then
1267
1267
1268
- restore_extra_arg=${extra_arg}
1268
+ restore_extra_arg=${extra_arg}
1269
1269
1270
- ifb_check=$( tc qdisc | grep " ingress" | grep " $i " ) ;
1270
+ ifb_check=$( tc qdisc | grep " ingress" | grep " $i " ) ;
1271
1271
1272
- if [[ " $ifb_check " = " " ]]; then
1272
+ if [[ " $ifb_check " = " " ]]; then
1273
1273
1274
- tc qdisc del dev $i root 2> /dev/null
1274
+ tc qdisc del dev $i root 2> /dev/null
1275
1275
1276
- if [[ " $sqm_inet_upload " != " " ]]; then
1277
- tc qdisc add dev $i root cake ${diffserv} nat ${overhead} bandwidth " $sqm_inet_upload " mbit $extra_arg
1278
- ifnq echo " Applying queue discipline to $i (ethernet interface)"
1279
- else
1280
- tc qdisc add dev $i root cake ${diffserv} nat ${overhead} $extra_arg
1281
- ifnq echo " Applying queue discipline to $i (ethernet interface)"
1282
- fi
1283
-
1284
- ip link add name ifb$i type ifb 2> /dev/null
1285
- tc qdisc del dev $i ingress 2> /dev/null
1286
- tc qdisc add dev $i handle ffff: ingress 2> /dev/null
1287
- tc qdisc del dev ifb$i root 2> /dev/null
1276
+ if [[ " $sqm_inet_upload " != " " ]]; then
1277
+ tc qdisc add dev $i root cake ${diffserv} nat ${overhead} bandwidth " $sqm_inet_upload " mbit $extra_arg
1278
+ ifnq echo " Applying queue discipline to $i (ethernet interface)"
1279
+ else
1280
+ tc qdisc add dev $i root cake ${diffserv} nat ${overhead} $extra_arg
1281
+ ifnq echo " Applying queue discipline to $i (ethernet interface)"
1282
+ fi
1288
1283
1289
- if [[ " $sqm_wash_markings " == " true" ]]; then
1290
- wash=" wash"
1291
- else
1292
- wash=" "
1293
- fi
1284
+ ip link add name ifb$i type ifb 2> /dev/null
1285
+ tc qdisc del dev $i ingress 2> /dev/null
1286
+ tc qdisc add dev $i handle ffff: ingress 2> /dev/null
1287
+ tc qdisc del dev ifb$i root 2> /dev/null
1294
1288
1295
- if [[ " $sqm_inet_download " != " " ]]; then
1296
- tc qdisc add dev ifb$i root cake ${diffserv} nat $wash bandwidth " $sqm_inet_download " mbit ${overhead} split-gso $extra_arg
1297
- ifnq echo " Applying queue discipline to ifb$i (ifb interface)"
1298
- else
1299
- tc qdisc add dev ifb$i root cake ${diffserv} nat $wash ${overhead} split-gso $extra_arg
1300
- ifnq echo " Applying queue discipline to ifb$i (ifb interface)"
1301
- fi
1289
+ if [[ " $sqm_wash_markings " == " true" ]]; then
1290
+ wash=" wash"
1291
+ else
1292
+ wash=" "
1293
+ fi
1302
1294
1303
- ip link set ifb$i up
1304
- tc filter add dev $i parent ffff: protocol all prio 10 u32 match u32 0 0 flowid 1:1 action mirred egress redirect dev ifb$i
1295
+ if [[ " $sqm_inet_download " != " " ]]; then
1296
+ tc qdisc add dev ifb$i root cake ${diffserv} nat $wash bandwidth " $sqm_inet_download " mbit ${overhead} split-gso $extra_arg
1297
+ ifnq echo " Applying queue discipline to ifb$i (ifb interface)"
1298
+ else
1299
+ tc qdisc add dev ifb$i root cake ${diffserv} nat $wash ${overhead} split-gso $extra_arg
1300
+ ifnq echo " Applying queue discipline to ifb$i (ifb interface)"
1301
+ fi
1305
1302
1306
- fi
1303
+ ip link set ifb$i up
1304
+ tc filter add dev $i parent ffff: protocol all prio 10 u32 match u32 0 0 flowid 1:1 action mirred egress redirect dev ifb$i
1305
+
1306
+ fi
1307
+
1308
+ extra_arg=${restore_extra_arg}
1307
1309
1308
- extra_arg=${restore_extra_arg}
1309
-
1310
1310
else
1311
- ifnq echo " Applying queue discipline to $i (ethernet interface)"
1311
+ ifnq echo " Applying queue discipline to $i (ethernet interface)"
1312
1312
tc qdisc del dev $i root 2> /dev/null
1313
1313
tc qdisc add dev $i root cake ${diffserv} nat ${overhead} split-gso $extra_arg
1314
1314
@@ -1416,9 +1416,9 @@ sqm_enable(){
1416
1416
fi
1417
1417
fi
1418
1418
else
1419
- if [[ $( sysctl net.ipv4.tcp_congestion_control | grep -i bbr | wc -l) -gt 0 ]]; then
1420
- sysctl net.ipv4.tcp_congestion_control=cubic
1421
- fi
1419
+ if [[ $( sysctl net.ipv4.tcp_congestion_control | grep -i bbr | wc -l) -gt 0 ]]; then
1420
+ sysctl net.ipv4.tcp_congestion_control=cubic
1421
+ fi
1422
1422
fi
1423
1423
1424
1424
@@ -1620,26 +1620,26 @@ ap_start(){
1620
1620
ifv echo " storing hostapd pid in /dev/shm/hostapd_pid_$i "
1621
1621
ifv echo " hostapd pid for $i -> $hostapd_pid "
1622
1622
1623
- if [[ " $hostapd_wait_for_secs " == " auto" ]]; then
1624
- # timeouts in a minute
1625
- half_seconds=0
1626
-
1627
- while [[ $half_seconds -lt 120 ]]; do
1628
-
1629
- check_done=$( cat /var/log/hostapd_$i .log | grep -c " AP-ENABLED" )
1630
-
1631
- if [[ $check_done -gt 0 ]]; then
1632
- echo " hostapd is ready, waited $(( half_seconds / 2 )) seconds."
1633
- break
1634
- fi
1635
-
1636
- sleep 0.5
1637
- half_seconds=$(( half_seconds + 1 ))
1638
- done
1639
-
1640
- else
1641
- echo " Waiting $hostapd_wait_for_secs seconds for hostapd to be ready (noauto)."
1642
- sleep $hostapd_wait_for_secs
1623
+ if [[ " $hostapd_wait_for_secs " == " auto" ]]; then
1624
+ # timeouts in a minute
1625
+ half_seconds=0
1626
+
1627
+ while [[ $half_seconds -lt 120 ]]; do
1628
+
1629
+ check_done=$( cat /var/log/hostapd_$i .log | grep -c " AP-ENABLED" )
1630
+
1631
+ if [[ $check_done -gt 0 ]]; then
1632
+ echo " hostapd is ready, waited $(( half_seconds / 2 )) seconds."
1633
+ break
1634
+ fi
1635
+
1636
+ sleep 0.5
1637
+ half_seconds=$(( half_seconds + 1 ))
1638
+ done
1639
+
1640
+ else
1641
+ echo " Waiting $hostapd_wait_for_secs seconds for hostapd to be ready (noauto)."
1642
+ sleep $hostapd_wait_for_secs
1643
1643
fi
1644
1644
1645
1645
setup_ap_networking $i || error " An error occourred trying to set up AP networking."
0 commit comments