merge: ssid: update default ssid

Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>

diff --git a/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh b/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh
index 2780fa16791d13e5987e749bf9fe37ac631c18d3..3643f6b1c6c41e4a60d1eeaa1304b928f487113e 100644 (file)
--- a/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -469,7 +469,7 @@ detect_broadcom() {
                        set wireless.default_wl${i}.device=wl${i}
                        set wireless.default_wl${i}.network=lan
                        set wireless.default_wl${i}.mode=ap
                        set wireless.default_wl${i}.device=wl${i}
                        set wireless.default_wl${i}.network=lan
                        set wireless.default_wl${i}.mode=ap

-                       set wireless.default_wl${i}.ssid=Lede${i#0}
+                       set wireless.default_wl${i}.ssid=OpenWrt${i#0}

                        set wireless.default_wl${i}.encryption=none
 EOF
                uci -q commit wireless
                        set wireless.default_wl${i}.encryption=none
 EOF
                uci -q commit wireless

diff --git a/package/kernel/mac80211/files/lib/wifi/mac80211.sh b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
index 940fb52ac273a421823e3169907e39c84fedc2ea..354077733e6b90cde2e5f670a64585bc8ec9bd1d 100644 (file)
--- a/package/kernel/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
@@ -122,7 +122,7 @@ detect_mac80211() {
                        set wireless.default_radio${devidx}.device=radio${devidx}
                        set wireless.default_radio${devidx}.network=lan
                        set wireless.default_radio${devidx}.mode=ap
                        set wireless.default_radio${devidx}.device=radio${devidx}
                        set wireless.default_radio${devidx}.network=lan
                        set wireless.default_radio${devidx}.mode=ap

-                       set wireless.default_radio${devidx}.ssid=LEDE
+                       set wireless.default_radio${devidx}.ssid=OpenWrt

                        set wireless.default_radio${devidx}.encryption=none
 EOF
                uci -q commit wireless
                        set wireless.default_radio${devidx}.encryption=none
 EOF
                uci -q commit wireless

diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index 4970874e6d8ff40e82ba112caae3d229f3f8a2c2..623b1f9afd0bbf4e1abc63ab9aace983d9f3ef69 100644 (file)
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -361,8 +361,8 @@ hostapd_set_bss_options() {
        [ -n "$wps_possible" -a -n "$config_methods" ] && {
                set_default ext_registrar 0
                set_default wps_device_type "6-0050F204-1"
        [ -n "$wps_possible" -a -n "$config_methods" ] && {
                set_default ext_registrar 0
                set_default wps_device_type "6-0050F204-1"

-               set_default wps_device_name "Lede AP"
-               set_default wps_manufacturer "www.lede-project.org"
+               set_default wps_device_name "OpenWrt AP"
+               set_default wps_manufacturer "www.openwrt.org"

                set_default wps_independent 1
 
                wps_state=2
                set_default wps_independent 1
 
                wps_state=2

diff --git a/target/linux/omap24xx/base-files/etc/config/wireless b/target/linux/omap24xx/base-files/etc/config/wireless
index f61721e5183a04aa9ed304b9f8c2b5e82e896af8..b640ce6c26abd1b6621458ea8c81c7f7dd3b2b6d 100644 (file)
--- a/target/linux/omap24xx/base-files/etc/config/wireless
+++ b/target/linux/omap24xx/base-files/etc/config/wireless
@@ -15,6 +15,6 @@ config wifi-iface
        option powersave 1
        option network  lan
        option mode     sta
        option powersave 1
        option network  lan
        option mode     sta

-       option ssid     LEDE
+       option ssid     OpenWrt

 #      option encryption psk2
 #      option key      "foobar"
 #      option encryption psk2
 #      option key      "foobar"