mirror of
https://git.FreeBSD.org/src.git
synced 2024-10-19 02:29:40 +00:00
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 commit05fc416403
. 1.9ce40d321d
bpf: Fix incorrect cleanup Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45599 (cherry picked from commit9738277b5c
) (cherry picked from commita8790965b0
)
This commit is contained in:
parent
c5d9624226
commit
82c1ab4413
17
sys/net/if.c
17
sys/net/if.c
@ -1314,21 +1314,9 @@ static int
|
||||
if_vmove(struct ifnet *ifp, struct vnet *new_vnet)
|
||||
{
|
||||
struct if_clone *ifc;
|
||||
#ifdef DEV_BPF
|
||||
u_int bif_dlt, bif_hdrlen;
|
||||
#endif
|
||||
void *old;
|
||||
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.
|
||||
@ -1374,11 +1362,6 @@ if_vmove(struct ifnet *ifp, struct vnet *new_vnet)
|
||||
|
||||
if_attach_internal(ifp, 1, ifc);
|
||||
|
||||
#ifdef DEV_BPF
|
||||
if (ifp->if_bpf == NULL)
|
||||
bpfattach(ifp, bif_dlt, bif_hdrlen);
|
||||
#endif
|
||||
|
||||
CURVNET_RESTORE();
|
||||
return (0);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user