summaryrefslogtreecommitdiffstats
path: root/lib/network
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni@mandriva.org>2009-04-21 13:33:00 +0000
committerEugeni Dodonov <eugeni@mandriva.org>2009-04-21 13:33:00 +0000
commit6f8669789bc6573ffd99a5f9a1fbde4e697bbc89 (patch)
tree25ee2fa4e7bedab9263978f596b335df29e7dbf1 /lib/network
parent9a09223e9f8aa63e63ec6638bbaf4efc036b9d10 (diff)
downloaddrakx-net-6f8669789bc6573ffd99a5f9a1fbde4e697bbc89.tar
drakx-net-6f8669789bc6573ffd99a5f9a1fbde4e697bbc89.tar.gz
drakx-net-6f8669789bc6573ffd99a5f9a1fbde4e697bbc89.tar.bz2
drakx-net-6f8669789bc6573ffd99a5f9a1fbde4e697bbc89.tar.xz
drakx-net-6f8669789bc6573ffd99a5f9a1fbde4e697bbc89.zip
Do not configure CRDA domain in drakconnect, only in draknetcenter.
Diffstat (limited to 'lib/network')
-rw-r--r--lib/network/connection/wireless.pm6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/network/connection/wireless.pm b/lib/network/connection/wireless.pm
index 33104da..78c30a8 100644
--- a/lib/network/connection/wireless.pm
+++ b/lib/network/connection/wireless.pm
@@ -361,8 +361,6 @@ sub check_device {
sub load_interface_settings {
my ($self) = @_;
$self->SUPER::load_interface_settings;
- require network::network;
- $self->{ifcfg}{CRDA_DOMAIN} ||= network::network::detect_crda_domain();
}
sub get_networks {
@@ -488,8 +486,6 @@ the username and password values specified here.") },
only used for EAP certificate based authentication. It could be
considered as the alternative to username/password combo.
Note: other related settings are shown on the Advanced page.") },
- { label => N("Wireless regulatory domain"), val => \$self->{ifcfg}{CRDA_DOMAIN},
- list => \@network::network::crda_domains, sort => 1, advanced => 1, },
{ label => N("Network ID"), val => \$self->{ifcfg}{WIRELESS_NWID}, advanced => 1 },
{ label => N("Operating frequency"), val => \$self->{ifcfg}{WIRELESS_FREQ}, advanced => 1 },
{ label => N("Sensitivity threshold"), val => \$self->{ifcfg}{WIRELESS_SENS}, advanced => 1 },
@@ -672,7 +668,7 @@ set SSID=$self->{access}{network}{essid}
set WPAPSK="$self->{access}{network}{key}"
set TxRate=0)),
(map { $_ => $self->{ifcfg}{$_} }
- qw(WIRELESS_NWID WIRELESS_FREQ WIRELESS_SENS WIRELESS_RATE WIRELESS_RTS WIRELESS_FRAG WIRELESS_IWCONFIG WIRELESS_IWSPY CRDA_DOMAIN), if_(!$self->need_rt2x00_iwpriv, 'WIRELESS_IWPRIV')),
+ qw(WIRELESS_NWID WIRELESS_FREQ WIRELESS_SENS WIRELESS_RATE WIRELESS_RTS WIRELESS_FRAG WIRELESS_IWCONFIG WIRELESS_IWSPY), if_(!$self->need_rt2x00_iwpriv, 'WIRELESS_IWPRIV')),
};
$self->SUPER::build_ifcfg_settings($settings);
}