fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-17 06:50:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: ensure carrier is always on for devices that don't support detection (rh #816719)

Browse source 
We broke this when splitting NMDeviceWired out of NMDeviceEthernet.
This commit is contained in:
Dan Williams 2012-04-28 11:48:01 -05:00
parent 0c760292fe
commit a091c7aa0f
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/nm-device-wired.c
View file

@ -162,6 +162,7 @@ set_carrier (NMDeviceWired *self,
{
NMDeviceWiredPrivate *priv;
NMDeviceState state;
guint32 caps;
g_return_if_fail (NM_IS_DEVICE (self));
@ -172,6 +173,13 @@ set_carrier (NMDeviceWired *self,
/* Clear any previous deferred action */
carrier_action_defer_clear (self);
/* Warn if we try to set carrier down on a device that
* doesn't support carrier detect. These devices assume
* the carrier is always up.
*/
caps = nm_device_get_capabilities (NM_DEVICE (self));
g_return_if_fail (caps & NM_DEVICE_CAP_CARRIER_DETECT);
priv->carrier = carrier;
g_object_notify (G_OBJECT (self), "carrier");
@ -200,10 +208,8 @@ carrier_on (NMNetlinkMonitor *monitor,
/* Make sure signal is for us */
if (idx == nm_device_get_ifindex (device)) {
/* Ignore spurious netlink messages */
caps = nm_device_get_capabilities (device);
if (!(caps & NM_DEVICE_CAP_CARRIER_DETECT))
return;
g_return_if_fail (caps & NM_DEVICE_CAP_CARRIER_DETECT);
set_carrier (self, TRUE, FALSE);
set_speed (self, ethtool_get_speed (self));
@ -224,10 +230,8 @@ carrier_off (NMNetlinkMonitor *monitor,
NMDeviceState state;
gboolean defer = FALSE;
/* Ignore spurious netlink messages */
caps = nm_device_get_capabilities (device);
if (!(caps & NM_DEVICE_CAP_CARRIER_DETECT))
return;
g_return_if_fail (caps & NM_DEVICE_CAP_CARRIER_DETECT);
/* Defer carrier-off event actions while connected by a few seconds
* so that tripping over a cable, power-cycling a switch, or breaking
@ -350,11 +354,15 @@ static gboolean
real_hw_bring_up (NMDevice *dev, gboolean *no_firmware)
{
gboolean success, carrier;
guint32 caps;
success = nm_system_iface_set_up (nm_device_get_ip_ifindex (dev), TRUE, no_firmware);
if (success) {
carrier = get_carrier_sync (NM_DEVICE_WIRED (dev));
set_carrier (NM_DEVICE_WIRED (dev), carrier, carrier ? FALSE : TRUE);
caps = nm_device_get_capabilities (dev);
if (caps & NM_DEVICE_CAP_CARRIER_DETECT) {
carrier = get_carrier_sync (NM_DEVICE_WIRED (dev));
set_carrier (NM_DEVICE_WIRED (dev), carrier, carrier ? FALSE : TRUE);
}
}
return success;
}