From cdc3798e820cd39f6eaca53518de9a71e399d16b Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Fri, 19 Sep 2014 16:47:14 +0200 Subject: [PATCH 1/1] fix hop limit --- PKGBUILD | 6 +- hop_limit.patch | 194 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 198 insertions(+), 2 deletions(-) create mode 100644 hop_limit.patch diff --git a/PKGBUILD b/PKGBUILD index 5a5d214..a399d29 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -21,16 +21,18 @@ makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc git checkdepends=(libx11 python-gobject python-dbus) #source=(git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=93c1041 source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz - NetworkManager.conf disable_set_hostname.patch git-fixes.patch) + NetworkManager.conf disable_set_hostname.patch git-fixes.patch hop_limit.patch) sha256sums=('66a88346bb04d4f402540281181340313b2ec433e75aa9d9ea13f31697f9487e' '759db295ddae7a6dc6b29211fc0ec08695f875584d456dd146d3679e2c33e2e3' '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' - '854b5f06fed30cbab2d71544197d53a8aacdeee12ec78a7f48acb9ff31b40889') + '854b5f06fed30cbab2d71544197d53a8aacdeee12ec78a7f48acb9ff31b40889' + '17d52c96c6d94b14e2bd8b4a0153b82f43196bf388794514fa24e2ff377777ad') prepare() { cd NetworkManager-$pkgver patch -Np1 -i ../git-fixes.patch patch -Np1 -i ../disable_set_hostname.patch + patch -Np1 -i ../hop_limit.patch NOCONFIGURE=1 ./autogen.sh } diff --git a/hop_limit.patch b/hop_limit.patch new file mode 100644 index 0000000..19b6172 --- /dev/null +++ b/hop_limit.patch @@ -0,0 +1,194 @@ + + + +NetworkManager/NetworkManager - Unnamed repository; edit this file to name it for gitweb. + + + + + + + +
+ + + + +
+summaryrefslogtreecommitdiff
+ + + +
+
+
diff options
context:
space:
mode:
+ + + + +
authorChristian Hesse <mail@eworm.de>2014-09-15 09:35:53 (GMT)
committerDan Williams <dcbw@redhat.com>2014-09-15 17:10:50 (GMT)
commit6a79acb03abc3406b3889738f8003e5f385af1eb (patch)
tree5121add44838bc2333b10f55b6c758a91f26baaa
parent4f01a3159154bde070036eaa1cbcdc1bd2805ccd (diff)
+
core: only set IPv6 hop_limit for values greater than zeronm-0-9-10
A "Cur Hop Limit" field value of 0 in a router advertisement means +"unspecified by this router" and should not be set in the kernel. + +(cherry picked from commit c668297257aef17f921518f6a7efac2ede2af76a) +
Diffstat
+
-rw-r--r--src/devices/nm-device.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 291f03f..3d8baf8 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -3616,7 +3616,9 @@ rdisc_config_changed (NMRDisc *rdisc, NMRDiscConfigMap changed, NMDevice *device
}
}
- if (changed & NM_RDISC_CONFIG_HOP_LIMIT) {
+ /* hop_limit == 0 is a special value "unspecified", so do not touch
+ * in this case */
+ if (changed & NM_RDISC_CONFIG_HOP_LIMIT && rdisc->hop_limit > 0) {
char val[16];
g_snprintf (val, sizeof (val), "%d", rdisc->hop_limit);
+
generated by cgit v0.10.2 at 2014-09-19 14:41:00 (GMT)
+
+ + -- 2.1.0