From nobody Wed May 17 09:59:12 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QLpV85VWWz49vYp; Wed, 17 May 2023 09:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QLpV84d8bz41bb; Wed, 17 May 2023 09:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684317552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=69h2YgSGMK3XvPT4PfV9moxWXKOh2et4AIC4zG7tdL0=; b=oFTnOQHc/kZ4o6H9MqpWUC33xaScx75d/HX90KwHDABPbbRXOnhlykE7UZJhMuIiEwvGvo 3ZdeNg2qQy9lhRRIifrthI0eZ2MJcN5vxoLM2YI2Wf6Hxf4lncRXX7tGRPuDJcnFocMFCS JuxK5lv4ybrbnlwLjuwZ2W10tJfu6Hfqe/SZ+SLHFctnshMz8nvZlt7OSV3lT89DIbddDQ IwJpP+mExnh2SwPHKt+CCs1tHt9B1o4kZpwYNgUbvd6EzpLGyx+P3eNEQwmWHyr9325hEO /Mfj1ntWccEDtM9VnTyb4Pbal7vy5LOpRMIxQIk6YAZfl7yCmbW8dy4TBYA9LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684317552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=69h2YgSGMK3XvPT4PfV9moxWXKOh2et4AIC4zG7tdL0=; b=Xj1vYzL6Z9lkiO+X3ehVYoHqsYLyGYi99Sw9dw+S6sKXmMzcQajL5qBY0mDtr9esy19IrA 7XNvyyCcMMk0ZevBA+aLHXrscaejer7QxwM2M6jU7SuH2IyNeXHEuXlRD1npOf8CW7HqCO wwqBymD73E5K6V3d/wRhVzNwVxLDP+r05VoMXEACKqugj4bEGqHw0DCPdZGQtnAbtnTnvd 3u9WJJQMe6jeNEPvmw7cv+bUXpeJw2UXhjp5XLgvQZlxLaTxiY8w1DROYOxk1AyaioqMZN bQ84n6wU17aWc5XcP84V76b3FWMjHye2P8u5RLaZxp4sj09Vw09fwfl/nPvNTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684317552; a=rsa-sha256; cv=none; b=hI4EdcE7x6jDW7PYKgsGzH6GLKlzP+IX43CkND4gnj83ZdkXBNY/E65OIvhZMOIRvNbEOl PtyARyp8k7W2Dej4XZvCWibdeP2+eN2BHIE8bZQyyEdjEysp7pTQNdx791MO9nYO0DIi/i NR/TZHk6dHB64d0ULPzKvJPVukPHDeieaJiBqXc5W+cd00pGVKchTsG73/fgocuEpaAorH JnNhhTkC9v6/QRElj6nZ9TpDA/0OxJfcQQvEzDEabtAm0Qo0w/xKCPmhqmljeD5fpVxkWC Nbg7NfyZ4squfNNI8Cujao8xAV6+5E0Yti26w4aYjpCbNtBYbmG7dvkuTFPNEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QLpV83k5TzyrY; Wed, 17 May 2023 09:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34H9xCkO039310; Wed, 17 May 2023 09:59:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34H9xC0S039309; Wed, 17 May 2023 09:59:12 GMT (envelope-from git) Date: Wed, 17 May 2023 09:59:12 GMT Message-Id: <202305170959.34H9xC0S039309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: ece63e96c364 - stable/13 - ip_mroute: Delete unreachable code List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ece63e96c364679e19c124d145abe5af789d1948 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ece63e96c364679e19c124d145abe5af789d1948 commit ece63e96c364679e19c124d145abe5af789d1948 Author: Zhenlei Huang AuthorDate: 2023-04-23 04:47:57 +0000 Commit: Zhenlei Huang 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;