Skip to content

Commit 32f168e

Browse files
committed
can_transmit_to_channel() ignores freq value just focus on channel number
1 parent f42dc43 commit 32f168e

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

lnxrouter

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -630,11 +630,7 @@ can_transmit_to_channel() {
630630
CHANNEL_NUM=$2
631631

632632
if [[ $USE_IWCONFIG -eq 0 ]]; then
633-
if [[ $FREQ_BAND == 2.4 ]]; then
634-
CHANNEL_INFO=$(get_adapter_info "${IFACE}" | grep -E " 24[0-9][0-9](\.0+){0,1} MHz \[${CHANNEL_NUM}\]")
635-
else
636-
CHANNEL_INFO=$(get_adapter_info "${IFACE}" | grep " \(49[0-9][0-9]\|5[0-9]\{3\}\) MHz \[${CHANNEL_NUM}\]")
637-
fi
633+
CHANNEL_INFO=$(get_adapter_info "${IFACE}" | grep -E " [0-9]+(\.[0-9]+){0,1} MHz \[${CHANNEL_NUM}\]")
638634
[[ -z "${CHANNEL_INFO}" ]] && return 1
639635
[[ "${CHANNEL_INFO}" == *no\ IR* ]] && return 1
640636
[[ "${CHANNEL_INFO}" == *disabled* ]] && return 1
@@ -665,9 +661,6 @@ ieee80211_frequency_to_channel() {
665661
fi
666662
}
667663

668-
is_5ghz_frequency() {
669-
[[ $1 =~ ^(49[0-9]{2})|(5[0-9]{3})$ ]]
670-
}
671664

672665
is_interface_wifi_connected() {
673666
if [[ $USE_IWCONFIG -eq 0 ]]; then
@@ -1700,7 +1693,7 @@ prepare_wifi_interface() {
17001693

17011694
# TODO move this to check_wifi_settings() ?
17021695
if is_interface_wifi_connected "${WIFI_IFACE}"; then
1703-
WIFI_IFACE_FREQ=$(iw dev "${WIFI_IFACE}" link | grep -i freq | awk '{print $2}' | sed 's/\.00*$//g')
1696+
WIFI_IFACE_FREQ=$(iw dev "${WIFI_IFACE}" link | grep -i freq | awk '{print $2}' | sed 's/\.00*$//g') # NOTE we assume integer currently, which can be right, or wrong in the future
17041697
WIFI_IFACE_CHANNEL=$(ieee80211_frequency_to_channel "${WIFI_IFACE_FREQ}")
17051698

17061699
echo "${WIFI_IFACE} already working in channel ${WIFI_IFACE_CHANNEL} (${WIFI_IFACE_FREQ} MHz)"

0 commit comments

Comments
 (0)