From c1a83915903d35e1e6296359c2b194de213a78d5 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 15 May 2006 22:32:59 +0000 Subject: Support cards which can't do carrier detect. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@841 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++-- debian/patches/11-carrier_detection.patch | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 debian/patches/11-carrier_detection.patch diff --git a/debian/changelog b/debian/changelog index f6501cb9..b42cddfe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,11 @@ network-manager (0.6.2-3) unstable; urgency=low - * Ship the NEWS.Debian file only for the network-manager package. + * Ship the NEWS.Debian file only for the network-manager package. (Closes: #367063) + * Added 11-carrier_detection.patch to support network cards which can't do + carrier detection. (Closes: #366373) - -- Michael Biebl Sat, 13 May 2006 12:35:03 +0200 + -- Michael Biebl Tue, 16 May 2006 00:16:43 +0200 network-manager (0.6.2-2) unstable; urgency=low diff --git a/debian/patches/11-carrier_detection.patch b/debian/patches/11-carrier_detection.patch new file mode 100644 index 00000000..ff7d1ecf --- /dev/null +++ b/debian/patches/11-carrier_detection.patch @@ -0,0 +1,17 @@ +=================================================================== +RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-3-ethernet.c,v +retrieving revision 1.13.2.1 +retrieving revision 1.13.2.2 +diff -u -r1.13.2.1 -r1.13.2.2 +--- src/nm-device-802-3-ethernet.c 2006/03/09 21:39:15 1.13.2.1 ++++ src/nm-device-802-3-ethernet.c 2006/05/13 19:06:05 1.13.2.2 +@@ -207,8 +207,7 @@ + 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; + } -- cgit 1.3.0-6-gf8a5