Mageia Bugzilla – Attachment 7261 Details for
Bug 17102
drakconnect defines unused variable LINK_DETECTION_DELAY
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
erased all _detection_ _DETECTION_ subchains
0001-del-all-_detection_.patch (text/plain), 2.81 KB, created by
Yves DEMUR
on 2015-12-02 22:16:10 CET
(
hide
)
Description:
erased all _detection_ _DETECTION_ subchains
Filename:
MIME Type:
Creator:
Yves DEMUR
Created:
2015-12-02 22:16:10 CET
Size:
2.81 KB
patch
obsolete
>From a59d2283966c6f9dbca3fa3779a0dcdac5a8d59e Mon Sep 17 00:00:00 2001 >From: Yves Demur <yves.demur@m4am.net> >Date: Wed, 2 Dec 2015 22:12:56 +0100 >Subject: [PATCH] del all _detection_ > >--- > NEWS | 2 +- > lib/network/connection/ethernet.pm | 4 ++-- > lib/network/network.pm | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > >diff --git a/NEWS b/NEWS >index a166d75..9192f78 100644 >--- a/NEWS >+++ b/NEWS >@@ -407,7 +407,7 @@ > o added support for connection traffic accounting. > o using correct sysctl variables when configuring advanced settings (#50807). > - ethernet backend: >- o added e1000e to the list of cards requiring LINK_DETECTION_DELAY (#49335). >+ o added e1000e to the list of cards requiring LINKDELAY (#49335). > - cellular backend: > o added Cingular connection provider (#48849). > o properly detecting Sierra Wireless card (#48849). >diff --git a/lib/network/connection/ethernet.pm b/lib/network/connection/ethernet.pm >index 47056bb..e4f83e2 100644 >--- a/lib/network/connection/ethernet.pm >+++ b/lib/network/connection/ethernet.pm >@@ -279,7 +279,7 @@ sub build_ifcfg_settings { > DNS1 => $self->{address}{dns1}, > DNS2 => $self->{address}{dns2}, > DOMAIN => $self->{address}{domain}, >- LINK_DETECTION_DELAY => $self->get_link_detection_delay, >+ LINKDELAY => $self->get_linkdelay, > }); > $self->network::connection::build_ifcfg_settings($settings); > } >@@ -498,7 +498,7 @@ sub configure_eth_aliases { > $::isStandalone and $modules_conf->write; > } > >-sub get_link_detection_delay { >+sub get_linkdelay { > my ($self) = @_; > member($self->get_driver, qw(b44 forcedeth r8169 skge sky2 tg3 via_velocity e1000e)) && 6; > } >diff --git a/lib/network/network.pm b/lib/network/network.pm >index 6b78b4c..c8648e6 100644 >--- a/lib/network/network.pm >+++ b/lib/network/network.pm >@@ -188,7 +188,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 MACADDR METRIC MII_NOT_SUPPORTED TYPE USERCTL ATM_ADDR ATM_DEVICE ETHTOOL_OPTS VLAN MTU DNS1 DNS2 DOMAIN RESOLV_MODS LINK_DETECTION_DELAY), >+ setVarsInSh($file, $intf, qw(DEVICE BOOTPROTO IPADDR NETMASK NETWORK BROADCAST GATEWAY ONBOOT HWADDR MACADDR METRIC MII_NOT_SUPPORTED TYPE USERCTL ATM_ADDR ATM_DEVICE ETHTOOL_OPTS VLAN MTU DNS1 DNS2 DOMAIN RESOLV_MODS LINKDELAY), > 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 CRDA_DOMAIN), > qw(DVB_ADAPTER_ID DVB_NETWORK_DEMUX DVB_NETWORK_PID), > qw(IPV6INIT IPV6TO4INIT), >-- >2.3.10 >
From a59d2283966c6f9dbca3fa3779a0dcdac5a8d59e Mon Sep 17 00:00:00 2001 From: Yves Demur <yves.demur@m4am.net> Date: Wed, 2 Dec 2015 22:12:56 +0100 Subject: [PATCH] del all _detection_ --- NEWS | 2 +- lib/network/connection/ethernet.pm | 4 ++-- lib/network/network.pm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index a166d75..9192f78 100644 --- a/NEWS +++ b/NEWS @@ -407,7 +407,7 @@ o added support for connection traffic accounting. o using correct sysctl variables when configuring advanced settings (#50807). - ethernet backend: - o added e1000e to the list of cards requiring LINK_DETECTION_DELAY (#49335). + o added e1000e to the list of cards requiring LINKDELAY (#49335). - cellular backend: o added Cingular connection provider (#48849). o properly detecting Sierra Wireless card (#48849). diff --git a/lib/network/connection/ethernet.pm b/lib/network/connection/ethernet.pm index 47056bb..e4f83e2 100644 --- a/lib/network/connection/ethernet.pm +++ b/lib/network/connection/ethernet.pm @@ -279,7 +279,7 @@ sub build_ifcfg_settings { DNS1 => $self->{address}{dns1}, DNS2 => $self->{address}{dns2}, DOMAIN => $self->{address}{domain}, - LINK_DETECTION_DELAY => $self->get_link_detection_delay, + LINKDELAY => $self->get_linkdelay, }); $self->network::connection::build_ifcfg_settings($settings); } @@ -498,7 +498,7 @@ sub configure_eth_aliases { $::isStandalone and $modules_conf->write; } -sub get_link_detection_delay { +sub get_linkdelay { my ($self) = @_; member($self->get_driver, qw(b44 forcedeth r8169 skge sky2 tg3 via_velocity e1000e)) && 6; } diff --git a/lib/network/network.pm b/lib/network/network.pm index 6b78b4c..c8648e6 100644 --- a/lib/network/network.pm +++ b/lib/network/network.pm @@ -188,7 +188,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 MACADDR METRIC MII_NOT_SUPPORTED TYPE USERCTL ATM_ADDR ATM_DEVICE ETHTOOL_OPTS VLAN MTU DNS1 DNS2 DOMAIN RESOLV_MODS LINK_DETECTION_DELAY), + setVarsInSh($file, $intf, qw(DEVICE BOOTPROTO IPADDR NETMASK NETWORK BROADCAST GATEWAY ONBOOT HWADDR MACADDR METRIC MII_NOT_SUPPORTED TYPE USERCTL ATM_ADDR ATM_DEVICE ETHTOOL_OPTS VLAN MTU DNS1 DNS2 DOMAIN RESOLV_MODS LINKDELAY), 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 CRDA_DOMAIN), qw(DVB_ADAPTER_ID DVB_NETWORK_DEMUX DVB_NETWORK_PID), qw(IPV6INIT IPV6TO4INIT), -- 2.3.10
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 17102
: 7261