Attachment 580559 Details for Bug 816719 – Ensure carrier is always on for devices incapable of carrier detection

[patch] Ensure carrier is always on for devices incapable of carrier detection

0001-core-ensure-carrier-is-always-on-for-devices-that-do.patch (text/plain), 1.89 KB, created by Dan Williams on 2012-04-26 20:26:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Williams

Created: 2012-04-26 20:26:42 UTC

Size: 1.89 KB

patch

obsolete

>From decd3c2fb59cf5deea4776589a2e1117710f9a4a Mon Sep 17 00:00:00 2001
>From: Dan Williams <dcbw@redhat.com>
>Date: Thu, 26 Apr 2012 15:24:21 -0500
>Subject: [PATCH] core: ensure carrier is always on for devices that don't
> support detection (rh #816719)
>
>We broke this when splitting NMDeviceWired out of NMDeviceEthernet.
>---
> src/nm-device-wired.c |   21 ++++++++++++++++++++-
> 1 files changed, 20 insertions(+), 1 deletions(-)
>
>diff --git a/src/nm-device-wired.c b/src/nm-device-wired.c
>index a476faa..0ed494d 100644
>--- a/src/nm-device-wired.c
>+++ b/src/nm-device-wired.c
>@@ -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,16 @@ 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));
>+	if (!(caps & NM_DEVICE_CAP_CARRIER_DETECT)) {
>+		g_warn_if_fail (carrier == TRUE);
>+		return;
>+	}
>+
> 	priv->carrier = carrier;
> 	g_object_notify (G_OBJECT (self), "carrier");
> 
>@@ -350,10 +361,18 @@ 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));
>+		caps = nm_device_get_capabilities (dev);
>+		if (caps & NM_DEVICE_CAP_CARRIER_DETECT)
>+			carrier = get_carrier_sync (NM_DEVICE_WIRED (dev));
>+		else {
>+			/* Carrier is always on for devices incapable of carrier detect */
>+			carrier = TRUE;
>+		}
>+
> 		set_carrier (NM_DEVICE_WIRED (dev), carrier, carrier ? FALSE : TRUE);
> 	}
> 	return success;
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 816719: 580559