atheros: minor fixes on modules load script

* don't use a login shell to run the script. It overrides the
  environment that comes from the caller script.

* optimize MAC address parsing

* enable 'P2P' and softmac on driver's load

https://jira.digi.com/browse/DEL-412

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2013-04-16 18:18:38 +02:00
parent 1061489a62
commit d88b0270ff
1 changed files with 4 additions and 5 deletions

View File

@ -1,4 +1,4 @@
#!/bin/sh -l #!/bin/sh
#=============================================================================== #===============================================================================
# #
# 10-atheros_pre-up # 10-atheros_pre-up
@ -27,8 +27,7 @@ MAC_FILENAME="softmac"
# Get the wlan MAC address from kernel command line. Use a default # Get the wlan MAC address from kernel command line. Use a default
# value if the address has not been set. # value if the address has not been set.
# #
MAC_ADDR="$(sed -e 's,.\+ethaddr2=\([^[:blank:]]\+\)[[:blank:]].*,\1,g' /proc/cmdline)"
MAC_ADDR=`cat /proc/cmdline | sed 's/\s/\n/g' | awk '/ethaddr2/ {print}' | sed 's/ethaddr2=//g'`
if [ -z "${MAC_ADDR}" -o "${MAC_ADDR}" = "00:00:00:00:00:00" ]; then if [ -z "${MAC_ADDR}" -o "${MAC_ADDR}" = "00:00:00:00:00:00" ]; then
MAC_ADDR="00:04:F3:4C:B1:D3" MAC_ADDR="00:04:F3:4C:B1:D3"
fi fi
@ -76,10 +75,10 @@ if [ ! -e "${BDATA_LINK}" ] || ! cmp -s "${BDATA_LINK}" "${FIRMWARE_DIR}/${BDATA
fi fi
# ath6kl_sdio.ko # ath6kl_sdio.ko
ATH6KL_PARAMS="" ATH6KL_PARAMS="ath6kl_p2p=1 softmac_enable=1"
[ -f "/root/wifi_test_mode" ] && { ATH6KL_PARAMS="${ATH6KL_PARAMS} testmode=1"; test_mode_str=" in test mode"; } [ -f "/root/wifi_test_mode" ] && { ATH6KL_PARAMS="${ATH6KL_PARAMS} testmode=1"; test_mode_str=" in test mode"; }
grep -qs ath6kl_sdio /proc/modules || \ grep -qs ath6kl_sdio /proc/modules || \
/sbin/modprobe --ignore-install -q ath6kl_sdio ${ATH6KL_PARAMS} || echo "Loading ath6kl_sdio module${test_mode_str}: [FAILED]" modprobe --ignore-install -q ath6kl_sdio ${ATH6KL_PARAMS} || echo "Loading ath6kl_sdio module${test_mode_str}: [FAILED]"
# Delay required for the interface 'wlan0' to settle down before trying to configure it. # Delay required for the interface 'wlan0' to settle down before trying to configure it.
sleep 0.5 sleep 0.5