diff options
| -rw-r--r-- | doc/manpages/frr-zebra.rst | 4 | ||||
| -rw-r--r-- | ospfd/ospf_network.c | 2 | ||||
| -rw-r--r-- | ripngd/ripng_nb_config.c | 2 | ||||
| -rw-r--r-- | tests/topotests/pytest.ini | 2 | ||||
| -rw-r--r-- | zebra/main.c | 1 |
5 files changed, 2 insertions, 9 deletions
diff --git a/doc/manpages/frr-zebra.rst b/doc/manpages/frr-zebra.rst index cfb368bf44..722b011ecd 100644 --- a/doc/manpages/frr-zebra.rst +++ b/doc/manpages/frr-zebra.rst @@ -25,10 +25,6 @@ OPTIONS available for the |DAEMON| command: Runs in batch mode, zebra parses its config and exits. -.. option:: -k, --keep_kernel - - On startup, don't delete self inserted routes. - .. option:: -s, --nl-bufsize <netlink-buffer-size> Set netlink receive buffer size. There are cases where zebra daemon can't handle flood of netlink messages from kernel. If you ever see "recvmsg overrun" messages in zebra log, you are in trouble. diff --git a/ospfd/ospf_network.c b/ospfd/ospf_network.c index 3a1547978a..28aec41eba 100644 --- a/ospfd/ospf_network.c +++ b/ospfd/ospf_network.c @@ -201,7 +201,6 @@ int ospf_sock_init(struct ospf *ospf) flog_err(EC_LIB_SOCKET, "Can't set IP_HDRINCL option for fd %d: %s", ospf_sock, safe_strerror(errno)); - close(ospf_sock); break; } #elif defined(IPTOS_PREC_INTERNETCONTROL) @@ -213,7 +212,6 @@ int ospf_sock_init(struct ospf *ospf) flog_err(EC_LIB_SOCKET, "can't set sockopt IP_TOS %d to socket %d: %s", tos, ospf_sock, safe_strerror(errno)); - close(ospf_sock); /* Prevent sd leak. */ break; } #else /* !IPTOS_PREC_INTERNETCONTROL */ diff --git a/ripngd/ripng_nb_config.c b/ripngd/ripng_nb_config.c index 85f378bc9e..25bf65f7aa 100644 --- a/ripngd/ripng_nb_config.c +++ b/ripngd/ripng_nb_config.c @@ -163,7 +163,7 @@ int ripngd_instance_default_information_originate_modify( ripng = nb_running_get_entry(args->dnode, NULL, true); default_information = yang_dnode_get_bool(args->dnode, NULL); - str2prefix_ipv6("::/0", &p); + (void)str2prefix_ipv6("::/0", &p); if (default_information) { ripng_redistribute_add(ripng, ZEBRA_ROUTE_RIPNG, RIPNG_ROUTE_DEFAULT, &p, 0, NULL, 0); diff --git a/tests/topotests/pytest.ini b/tests/topotests/pytest.ini index 2e9c4901bc..6e8e749092 100644 --- a/tests/topotests/pytest.ini +++ b/tests/topotests/pytest.ini @@ -1,6 +1,6 @@ # Skip pytests example directory [pytest] -norecursedirs = .git example-test example-topojson-test lib docker evpn_type5_test_topo1 +norecursedirs = .git example-test example-topojson-test lib docker [topogen] # Default configuration values diff --git a/zebra/main.c b/zebra/main.c index 2afef46bb2..6b6409f845 100644 --- a/zebra/main.c +++ b/zebra/main.c @@ -87,7 +87,6 @@ uint32_t nl_rcvbufsize = 4194304; const struct option longopts[] = { {"batch", no_argument, NULL, 'b'}, {"allow_delete", no_argument, NULL, 'a'}, - {"keep_kernel", no_argument, NULL, 'k'}, {"socket", required_argument, NULL, 'z'}, {"ecmp", required_argument, NULL, 'e'}, {"retain", no_argument, NULL, 'r'}, |