summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Shewmaker <agshew@gmail.com>2014-12-03 23:07:31 +0100
committerDavid S. Miller <davem@davemloft.net>2014-12-09 19:38:13 +0100
commit5d330cddb907df0911652c447baf9ee1a137245d (patch)
tree865be716ddcbaf96102dcd38eff5a7d5dede1782
parentMerge tag 'master-2014-12-01' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
downloadlinux-5d330cddb907df0911652c447baf9ee1a137245d.tar.xz
linux-5d330cddb907df0911652c447baf9ee1a137245d.zip
Update old iproute2 and Xen Remus links
Signed-off-by: Andrew Shewmaker <agshew@gmail.com> Acked-by: Stephen Hemminger <stephen@networkplumber.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--Documentation/Changes2
-rw-r--r--net/sched/Kconfig7
2 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/Changes b/Documentation/Changes
index 1de131bb49fb..74bdda9272a4 100644
--- a/Documentation/Changes
+++ b/Documentation/Changes
@@ -383,7 +383,7 @@ o <http://www.iptables.org/downloads.html>
Ip-route2
---------
-o <ftp://ftp.tux.org/pub/net/ip-routing/iproute2-2.2.4-now-ss991023.tar.gz>
+o <https://www.kernel.org/pub/linux/utils/net/iproute2/>
OProfile
--------
diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index a1a8e29e5fc9..d17053d9e9e2 100644
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -22,8 +22,9 @@ menuconfig NET_SCHED
This code is considered to be experimental.
To administer these schedulers, you'll need the user-level utilities
- from the package iproute2+tc at <ftp://ftp.tux.org/pub/net/ip-routing/>.
- That package also contains some documentation; for more, check out
+ from the package iproute2+tc at
+ <https://www.kernel.org/pub/linux/utils/net/iproute2/>. That package
+ also contains some documentation; for more, check out
<http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2>.
This Quality of Service (QoS) support will enable you to use
@@ -336,7 +337,7 @@ config NET_SCH_PLUG
of virtual machines by allowing the generated network output to be rolled
back if needed.
- For more information, please refer to http://wiki.xensource.com/xenwiki/Remus
+ For more information, please refer to <http://wiki.xenproject.org/wiki/Remus>
Say Y here if you are using this kernel for Xen dom0 and
want to protect Xen guests with Remus.