Attachment #226498 for bug #257218

View | Details | Raw Unified | Return to bug 257218
Collapse All | Expand All




	IFNET_WUNLOCK();

	epoch_wait_preempt(net_epoch_preempt);
	EVENTHANDLER_INVOKE(group_change_event, groupname);
	if (freeifgl) {
		EVENTHANDLER_INVOKE(group_detach_event, ifgl->ifgl_group);
		free(ifgl->ifgl_group, M_TEMP);
	}
	free(ifgm, M_TEMP);
	free(ifgl, M_TEMP);

	EVENTHANDLER_INVOKE(group_change_event, groupname);
}

/*

Lines 999-1004 pfi_detach_ifnet_event(void arg __unused, struct ifnet ifp) Link Here

(-)b/sys/netpfil/pf/pf_if.c (+4 lines)
999	#ifdef ALTQ	999	#ifdef ALTQ
1000	pf_altq_ifnet_event(ifp, 1);	1000	pf_altq_ifnet_event(ifp, 1);
1001	#endif	1001	#endif
		1002	pfi_kkif_ref(kif);
		1003	pfi_kkif_unref(kif);
1002	PF_RULES_WUNLOCK();	1004	PF_RULES_WUNLOCK();
1003	NET_EPOCH_EXIT(et);	1005	NET_EPOCH_EXIT(et);
1004	}	1006	}
Lines 1059-1064 pfi_detach_group_event(void arg __unused, struct ifg_group ifg) Link Here
1059		1061
1060	kif->pfik_group = NULL;	1062	kif->pfik_group = NULL;
1061	ifg->ifg_pf_kif = NULL;	1063	ifg->ifg_pf_kif = NULL;
		1064	pfi_kkif_ref(kif);
		1065	pfi_kkif_unref(kif);
1062	PF_RULES_WUNLOCK();	1066	PF_RULES_WUNLOCK();
1063	}	1067	}
1064		1068

Return to bug 257218

Lines 1593-1606 _if_delgroup_locked(struct ifnet ifp, struct ifg_list ifgl, Link Here

(-)b/sys/net/if.c (-2 / +1 lines)
1593	IFNET_WUNLOCK();	1593	IFNET_WUNLOCK();
1594		1594
1595	epoch_wait_preempt(net_epoch_preempt);	1595	epoch_wait_preempt(net_epoch_preempt);
		1596	EVENTHANDLER_INVOKE(group_change_event, groupname);
1596	if (freeifgl) {	1597	if (freeifgl) {
1597	EVENTHANDLER_INVOKE(group_detach_event, ifgl->ifgl_group);	1598	EVENTHANDLER_INVOKE(group_detach_event, ifgl->ifgl_group);
1598	free(ifgl->ifgl_group, M_TEMP);	1599	free(ifgl->ifgl_group, M_TEMP);
1599	}	1600	}
1600	free(ifgm, M_TEMP);	1601	free(ifgm, M_TEMP);
1601	free(ifgl, M_TEMP);	1602	free(ifgl, M_TEMP);
1602
1603	EVENTHANDLER_INVOKE(group_change_event, groupname);
1604	}	1603	}
1605		1604
1606	/*	1605	/*