diff --git a/repos/pc/src/drivers/wifi/pc/README b/repos/pc/src/drivers/wifi/pc/README index 982ed0c8f6..2846f65963 100644 --- a/repos/pc/src/drivers/wifi/pc/README +++ b/repos/pc/src/drivers/wifi/pc/README @@ -96,10 +96,6 @@ Currently only WPA/WPA2 protection using a passphrase is supported and the the SSID is copied verbatim. At the moment, there is no way to express or escape non alphanumeric characters. -On certain cards, e.g. Intel Wireless 6200 ABG, it may be necessary to disable -the 11n mode. This can be achieved by setting the 'use_11n' attribute in -the 'wifi_config' node to 'no'. - The driver optionally reports the following information under the label "devices" if requested in the config as depicted. diff --git a/repos/pc/src/drivers/wifi/pc/frontend.h b/repos/pc/src/drivers/wifi/pc/frontend.h index 9cd9379ec8..cc8cf8f859 100644 --- a/repos/pc/src/drivers/wifi/pc/frontend.h +++ b/repos/pc/src/drivers/wifi/pc/frontend.h @@ -365,7 +365,6 @@ struct Wifi::Frontend bool _verbose { false }; bool _verbose_state { false }; - bool _use_11n { true }; bool _deferred_config_update { false }; bool _single_autoconnect { false }; @@ -384,9 +383,6 @@ struct Wifi::Frontend _verbose = config.attribute_value("verbose", _verbose); _verbose_state = config.attribute_value("verbose_state", _verbose_state); - /* only evaluated at start-up */ - _use_11n = config.attribute_value("use_11n", _use_11n); - Genode::uint64_t connected_scan_interval = Util::check_time(config.attribute_value("connected_scan_interval", _connected_scan_interval), @@ -1621,11 +1617,6 @@ struct Wifi::Frontend _handle_scan_timer(); } - /** - * Return if 11n operation is enabled - */ - bool use_11n() const { return _use_11n; } - /** * Get RFKILL signal capability * diff --git a/repos/pc/src/drivers/wifi/pc/main.cc b/repos/pc/src/drivers/wifi/pc/main.cc index 05f78c00fe..75089e190f 100644 --- a/repos/pc/src/drivers/wifi/pc/main.cc +++ b/repos/pc/src/drivers/wifi/pc/main.cc @@ -85,7 +85,7 @@ void wifi_notify_event(void) /* exported by wifi.lib.so */ -extern void wifi_init(Genode::Env&, Genode::Blockade&, bool); +extern void wifi_init(Genode::Env&, Genode::Blockade&); extern void wifi_set_rfkill_sigh(Genode::Signal_context_capability); @@ -102,7 +102,7 @@ struct Main { _wpa.construct(env, _wpa_startup_blockade); - wifi_init(env, _wpa_startup_blockade, false); + wifi_init(env, _wpa_startup_blockade); } }; diff --git a/repos/pc/src/lib/wifi/wlan.cc b/repos/pc/src/lib/wifi/wlan.cc index 4dd9a7820a..0532e15307 100644 --- a/repos/pc/src/lib/wifi/wlan.cc +++ b/repos/pc/src/lib/wifi/wlan.cc @@ -115,11 +115,8 @@ Genode::Blockade *wpa_blockade; void wifi_init(Genode::Env &env, - Genode::Blockade &blockade, - bool disable_11n) + Genode::Blockade &blockade) { - (void)disable_11n; - wpa_blockade = &blockade; static Wlan wlan(env);