diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-08-01 08:48:58 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-08-01 08:48:58 +0000 |
| commit | a76ec6c567bead16357d7fcd2583d97eb889f0c1 (patch) | |
| tree | 780a29c5dc8e1ec8f9b531746c5430642655b938 | |
| parent | 8df8027c3ffbd275d42837a1c55624aafad128a2 (diff) | |
| download | drakx-net-a76ec6c567bead16357d7fcd2583d97eb889f0c1.tar drakx-net-a76ec6c567bead16357d7fcd2583d97eb889f0c1.tar.gz drakx-net-a76ec6c567bead16357d7fcd2583d97eb889f0c1.tar.bz2 drakx-net-a76ec6c567bead16357d7fcd2583d97eb889f0c1.tar.xz drakx-net-a76ec6c567bead16357d7fcd2583d97eb889f0c1.zip | |
write WIRELESS_WPA_REASSOCIATE=yes for rt61pci driver
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | lib/network/connection/wireless.pm | 6 | ||||
| -rw-r--r-- | lib/network/network.pm | 2 |
3 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,5 @@ +- write WIRELESS_WPA_REASSOCIATE=yes for rt61pci driver + 0.39: - update some icons - update translations diff --git a/lib/network/connection/wireless.pm b/lib/network/connection/wireless.pm index 0a4f891..203dbef 100644 --- a/lib/network/connection/wireless.pm +++ b/lib/network/connection/wireless.pm @@ -593,6 +593,7 @@ sub build_ifcfg_settings { WIRELESS_MODE => $self->{access}{network}{mode}, if_($self->need_wpa_supplicant, WIRELESS_WPA_DRIVER => wpa_supplicant_get_driver($self->get_driver), + WIRELESS_WPA_REASSOCIATE => bool2yesno($self->need_wpa_supplicant_reassociate), MII_NOT_SUPPORTED => 'no', ), WIRELESS_ESSID => $self->{access}{network}{essid}, @@ -709,6 +710,11 @@ sub is_wpa_supplicant_blacklisted { is_old_rt2x00($module); } +sub need_wpa_supplicant_reassociate { + my ($self) = @_; + $self->get_driver eq 'rt61pci'; +} + sub need_rt2x00_iwpriv { my ($self) = @_; is_old_rt2x00($self->get_driver) && $self->{access}{network}{encryption} eq 'wpa-psk'; diff --git a/lib/network/network.pm b/lib/network/network.pm index 75ba03d..5f6df53 100644 --- a/lib/network/network.pm +++ b/lib/network/network.pm @@ -182,7 +182,7 @@ sub update_broadcast_and_network { sub write_interface_settings { my ($intf, $file) = @_; setVarsInSh($file, $intf, qw(DEVICE BOOTPROTO IPADDR NETMASK NETWORK BROADCAST GATEWAY ONBOOT HWADDR METRIC MII_NOT_SUPPORTED TYPE USERCTL ATM_ADDR ETHTOOL_OPTS VLAN MTU DNS1 DNS2 DOMAIN RESOLV_MODS LINK_DETECTION_DELAY), - qw(WIRELESS_MODE WIRELESS_ESSID WIRELESS_NWID WIRELESS_FREQ WIRELESS_SENS WIRELESS_RATE WIRELESS_ENC_KEY WIRELESS_ENC_MODE WIRELESS_RTS WIRELESS_FRAG WIRELESS_IWCONFIG WIRELESS_IWSPY WIRELESS_IWPRIV WIRELESS_WPA_DRIVER), + qw(WIRELESS_MODE WIRELESS_ESSID WIRELESS_NWID WIRELESS_FREQ WIRELESS_SENS WIRELESS_RATE WIRELESS_ENC_KEY WIRELESS_ENC_MODE WIRELESS_RTS WIRELESS_FRAG WIRELESS_IWCONFIG WIRELESS_IWSPY WIRELESS_IWPRIV WIRELESS_WPA_DRIVER WIRELESS_WPA_REASSOCIATE), qw(DVB_ADAPTER_ID DVB_NETWORK_DEMUX DVB_NETWORK_PID), qw(IPV6INIT IPV6TO4INIT), qw(MRU REMIP PPPOPTIONS HARDFLOWCTL DEFABORT RETRYTIMEOUT PAPNAME LINESPEED MODEMPORT DEBUG ESCAPECHARS INITSTRING), |