summaryrefslogtreecommitdiff
path: root/Documentation/networking/devlink/devlink-dpipe.rst
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-04-05 08:56:10 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-04-05 08:56:10 +0200
commitde800f290dfaa341f22acac22bc454ea2bbf8f71 (patch)
tree02ac02009524e4a8a4c1b169583618690bdd2567 /Documentation/networking/devlink/devlink-dpipe.rst
parentbee1f89aad2a51cd3339571bc8eadbb0dc88a683 (diff)
parente49d033bddf5b565044e2abe4241353959bc9120 (diff)
Merge 5.12-rc6 into usb-next
We want the USB fixes in here as well and it resolves a merge issue with xhci-mtk.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/networking/devlink/devlink-dpipe.rst')
-rw-r--r--Documentation/networking/devlink/devlink-dpipe.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/devlink/devlink-dpipe.rst b/Documentation/networking/devlink/devlink-dpipe.rst
index 468fe1001b74..af37f250df43 100644
--- a/Documentation/networking/devlink/devlink-dpipe.rst
+++ b/Documentation/networking/devlink/devlink-dpipe.rst
@@ -52,7 +52,7 @@ purposes as a standard complementary tool. The system's view from
``devlink-dpipe`` should change according to the changes done by the
standard configuration tools.
-For example, it’s quiet common to implement Access Control Lists (ACL)
+For example, it’s quite common to implement Access Control Lists (ACL)
using Ternary Content Addressable Memory (TCAM). The TCAM memory can be
divided into TCAM regions. Complex TC filters can have multiple rules with
different priorities and different lookup keys. On the other hand hardware