From 5f9f987e17f77dfeae4de94829456ae8f73b3811 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Sat, 13 May 2006 19:06:05 +0000 Subject: [PATCH] 2006-05-13 Dan Williams * src/nm-device-802-3-ethernet.c - (real_get_generic_capabilities): Don't ignore devices that can't do carrier detect (Debian bug #366373) git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1733 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ src/nm-device-802-3-ethernet.c | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7eb63a01ba..b094579d70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-05-13 Dan Williams + + * src/nm-device-802-3-ethernet.c + - (real_get_generic_capabilities): Don't ignore devices that can't do + carrier detect (Debian bug #366373) + 2006-05-11 Dan Williams Patch from Michael Biebl diff --git a/src/nm-device-802-3-ethernet.c b/src/nm-device-802-3-ethernet.c index adc54fe4d3..cf2155f867 100644 --- a/src/nm-device-802-3-ethernet.c +++ b/src/nm-device-802-3-ethernet.c @@ -288,8 +288,7 @@ real_get_generic_capabilities (NMDevice *dev) if (supports_ethtool_carrier_detect (self) || supports_mii_carrier_detect (self)) caps |= NM_DEVICE_CAP_CARRIER_DETECT; - if (caps) - caps |= NM_DEVICE_CAP_NM_SUPPORTED; + caps |= NM_DEVICE_CAP_NM_SUPPORTED; return caps; }