The branch stable/13 has been updated by zlei:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=ece63e96c364679e19c124d145abe5af789d1948

commit ece63e96c364679e19c124d145abe5af789d1948
Author:     Zhenlei Huang <z...@freebsd.org>
AuthorDate: 2023-04-23 04:47:57 +0000
Commit:     Zhenlei Huang <z...@freebsd.org>
CommitDate: 2023-05-17 09:57:07 +0000

    ip_mroute: Delete unreachable code
    
    As the flag M_WAITOK is passed to ip_encap_attach(), then the function
    will never return NULL, and the following code within NULL check branch
    will be unreachable.
    
    No functional change intended.
    
    Reviewed by:    kp
    Fixes:          6d8fdfa9d5e7d Rework IP encapsulation handling code
    MFC after:      1 week
    Differential Revision:  https://reviews.freebsd.org/D39746
    
    (cherry picked from commit b658c0fce10a06493dc468fc9f6699120473e17b)
---
 sys/netinet/ip_mroute.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index 6aeea44f631c..39d2e1c26a48 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -2891,13 +2891,6 @@ ip_mroute_modevent(module_t mod, int type, void *unused)
            &pim_squelch_wholepkt);
 
        pim_encap_cookie = ip_encap_attach(&ipv4_encap_cfg, NULL, M_WAITOK);
-       if (pim_encap_cookie == NULL) {
-               printf("ip_mroute: unable to attach pim encap\n");
-               VIF_LOCK_DESTROY();
-               MFC_LOCK_DESTROY();
-               MROUTER_LOCK_DESTROY();
-               return (EINVAL);
-       }
 
        ip_mcast_src = X_ip_mcast_src;
        ip_mforward = X_ip_mforward;

Reply via email to