Merge pull request #11770 from donaldsharp/static_mpls_label_change

staticd: When changing the underlying nh ensure it is reinstalled

diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index d9b0fab518dcfcf443cd48e497f1dfd0dc9b1647..1297eb440ea36748ae5ca2ecb1f02308bda83912 100644 (file)
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -454,8 +454,7 @@ int main(int argc, char **argv)
                }
                case 'l':
                        listnode_add_sort_nodup(addresses, optarg);
-               /* listenon implies -n */
-               /* fallthru */
+                       break;
                case 'n':
                        no_fib_flag = 1;
                        break;

diff --git a/doc/user/overview.rst b/doc/user/overview.rst
index bf401825e05c73ee5256444e59a6a6112db00a59..91ca1b89f08de89df475c2a9f59d6a7b118c9391 100644 (file)
--- a/doc/user/overview.rst
+++ b/doc/user/overview.rst
@@ -258,7 +258,7 @@ feature you're interested in, it should be supported on your platform.
 +-----------------------------------+----------------+--------------+------------+------------+
 | **Multicast Routing**             |                |              |            |            |
 +-----------------------------------+----------------+--------------+------------+------------+
-| `pimd` (PIM)                      | :mark:`≥4.18`  | :mark:`N`    | :mark:`Y`  | :mark:`Y`  |
+| `pimd` (PIM)                      | :mark:`≥4.19`  | :mark:`N`    | :mark:`Y`  | :mark:`Y`  |
 +-----------------------------------+----------------+--------------+------------+------------+
 |    SSM (Source Specific)          | :mark:`Y`      | :mark:`N`    | :mark:`Y`  | :mark:`Y`  |
 +-----------------------------------+----------------+--------------+------------+------------+

diff --git a/doc/user/pim.rst b/doc/user/pim.rst
index ae39f4220d0b701a484905661f2f1d6571f02c12..44ade916a2227869dd42ba815e852686a9120c40 100644 (file)
--- a/doc/user/pim.rst
+++ b/doc/user/pim.rst
@@ -13,7 +13,7 @@ network for optimizing forwarding of overlay BUM traffic.
 
 .. note::
 
-   On Linux for PIM-SM operation you *must* have kernel version 4.18 or greater.
+   On Linux for PIM-SM operation you *must* have kernel version 4.19 or greater.
    To use PIM for EVPN BUM forwarding, kernels 5.0 or greater are required.
    OpenBSD has no multicast support and FreeBSD, and NetBSD only
    have support for SSM.