diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/user/installation.rst | 12 | ||||
| -rw-r--r-- | doc/user/sharp.rst | 10 |
2 files changed, 13 insertions, 9 deletions
diff --git a/doc/user/installation.rst b/doc/user/installation.rst index 9654cc2eb8..2decfcc4b2 100644 --- a/doc/user/installation.rst +++ b/doc/user/installation.rst @@ -324,7 +324,7 @@ GNU/Linux, make sure that the current kernel configuration is what you want. FRR will run with any kernel configuration but some recommendations do exist. :makevar:`CONFIG_NETLINK` - Kernel/User Netlink socket. This is a enables an advanced interface between + Kernel/User Netlink socket. This enables an advanced interface between the Linux kernel and *zebra* (:ref:`kernel-interface`). :makevar:`CONFIG_RTNETLINK` @@ -356,9 +356,9 @@ Additional kernel modules are also needed to support MPLS forwarding. net.ipv6.conf.all.forwarding=1 :makevar:`MPLS forwarding` - Basic MPLS kernel support was introduced 4.1, additional capability - was introduced in 4.3 and 4.5. For some general information on Linux - MPLS support see + Basic MPLS support was introduced in the kernel in version 4.1 and + additional capability was introduced in 4.3 and 4.5. + For some general information on Linux MPLS support, see https://www.netdevconf.org/1.1/proceedings/slides/prabhu-mpls-tutorial.pdf. The following modules should be loaded to support MPLS forwarding, and are generally added to a configuration file such as @@ -418,7 +418,7 @@ Additional kernel modules are also needed to support MPLS forwarding. running these kernel versions, if unable to establish any VRF BGP adjacencies, either downgrade to 4.13 or set 'net.ipv4.tcp_l3mdev_accept=1'. The fix for this issue is planned to be - included in future kernel versions so upgrading your kernel may also + included in future kernel versions. So upgrading your kernel may also address this issue. @@ -440,7 +440,7 @@ the options you chose: --enable-watchfrr \ ... -After configuring the software, you are ready to build and install it for your +After configuring the software, you are ready to build and install it in your system. .. code-block:: shell diff --git a/doc/user/sharp.rst b/doc/user/sharp.rst index 8831c0159b..c2d32a718e 100644 --- a/doc/user/sharp.rst +++ b/doc/user/sharp.rst @@ -33,16 +33,20 @@ All sharp commands are under the enable node and preceeded by the ``sharp`` keyword. At present, no sharp commands will be preserved in the config. .. index:: sharp install -.. clicmd:: sharp install routes A.B.C.D nexthop <E.F.G.H|X:X::X:X> (1-1000000) +.. clicmd:: sharp install routes A.B.C.D <nexthop <E.F.G.H|X:X::X:X>|nexthop-group NAME> (1-1000000) [instance (0-255)] [repeat (2-1000)] Install up to 1,000,000 (one million) /32 routes starting at ``A.B.C.D`` with specified nexthop ``E.F.G.H`` or ``X:X::X:X``. The nexthop is a ``NEXTHOP_TYPE_IPV4`` or ``NEXTHOP_TYPE_IPV6`` and must be reachable - to be installed into the kernel. The routes are installed into zebra as - ``ZEBRA_ROUTE_SHARP`` and can be used as part of a normal route + to be installed into the kernel. Alternatively a nexthop-group NAME + can be specified and used as the nexthops. The routes are installed into + zebra as ``ZEBRA_ROUTE_SHARP`` and can be used as part of a normal route redistribution. Route installation time is noted in the debug log. When zebra successfully installs a route into the kernel and SHARP receives success notifications for all routes this is logged as well. + Instance (0-255) if specified causes the routes to be installed in a different + instance. If repeat is used then we will install/uninstall the routes the + number of times specified. .. index:: sharp remove .. clicmd:: sharp remove routes A.B.C.D (1-1000000) |