git: 9738277b5c66 - main - ifnet: Remove dead code

The branch main has been updated by zlei:

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

commit 9738277b5c662a75347efa6a58daea485d30f895
Author:     Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-06-30 09:44:21 +0000
Commit:     Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-06-30 09:44:21 +0000

    ifnet: Remove dead code
    
    Since change [1], if_bpf will not be detached by the interface departure
    eventhandler and will not be NULL. Then the logic to re-attach if_bpf
    becomes dead and serves no purpose any more.
    
    This partially reverts commit 05fc416403ec.
    
    1. 9ce40d321dd5 bpf: Fix incorrect cleanup
    
    Reviewed by:    kp
    MFC after:      1 week
    Differential Revision:  https://reviews.freebsd.org/D45599
---
 sys/net/if.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/sys/net/if.c b/sys/net/if.c
index 98be23e564c6..ee8fe533f338 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1265,20 +1265,8 @@ finish_vnet_shutdown:
 static int
 if_vmove(struct ifnet *ifp, struct vnet *new_vnet)
 {
-#ifdef DEV_BPF
-	u_int bif_dlt, bif_hdrlen;
-#endif
 	int rc;
 
-#ifdef DEV_BPF
- 	/*
-	 * if_detach_internal() will call the eventhandler to notify
-	 * interface departure.  That will detach if_bpf.  We need to
-	 * safe the dlt and hdrlen so we can re-attach it later.
-	 */
-	bpf_get_bp_params(ifp->if_bpf, &bif_dlt, &bif_hdrlen);
-#endif
-
 	/*
 	 * Detach from current vnet, but preserve LLADDR info, do not
 	 * mark as dead etc. so that the ifnet can be reattached later.
@@ -1300,12 +1288,6 @@ if_vmove(struct ifnet *ifp, struct vnet *new_vnet)
 	 */
 	CURVNET_SET_QUIET(new_vnet);
 	if_attach_internal(ifp, true);
-
-#ifdef DEV_BPF
-	if (ifp->if_bpf == NULL)
-		bpfattach(ifp, bif_dlt, bif_hdrlen);
-#endif
-
 	CURVNET_RESTORE();
 	return (0);
 }