summaryrefslogtreecommitdiffstats
path: root/Documentation/networking
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-01-05 17:03:07 +0100
committerDavid S. Miller <davem@davemloft.net>2017-01-05 17:03:07 +0100
commit76eb75be79b52a3c6ae1fd840083fa1a04458c1c (patch)
treebb90a570be2b1f521913b6233e11bae841608ad0 /Documentation/networking
parentpacket: fix panic in __packet_set_timestamp on tpacket_v3 in tx mode (diff)
parentMerge tag 'xfs-for-linus-4.10-rc3' of git://git.kernel.org/pub/scm/fs/xfs/xfs... (diff)
downloadlinux-76eb75be79b52a3c6ae1fd840083fa1a04458c1c.tar.xz
linux-76eb75be79b52a3c6ae1fd840083fa1a04458c1c.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'Documentation/networking')
-rw-r--r--Documentation/networking/mpls-sysctl.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/networking/mpls-sysctl.txt b/Documentation/networking/mpls-sysctl.txt
index 9ed15f86c17c..15d8d16934fd 100644
--- a/Documentation/networking/mpls-sysctl.txt
+++ b/Documentation/networking/mpls-sysctl.txt
@@ -5,8 +5,8 @@ platform_labels - INTEGER
possible to configure forwarding for label values equal to or
greater than the number of platform labels.
- A dense utliziation of the entries in the platform label table
- is possible and expected aas the platform labels are locally
+ A dense utilization of the entries in the platform label table
+ is possible and expected as the platform labels are locally
allocated.
If the number of platform label table entries is set to 0 no