From: | Matthew Dillon <dillon@xxxxxxxxxxxxxxxxxxxxxxx> |
Date: | Sat, 31 Dec 2005 16:59:06 -0800 (PST) |
dillon 2005/12/31 16:59:06 PST DragonFly src repository Modified files: (Branch: DragonFly_RELEASE_1_4) sys/dev/netif/an if_an.c sys/dev/netif/awi if_awi_pccard.c sys/dev/netif/bfe if_bfe.c sys/dev/netif/bge if_bge.c sys/dev/netif/cm if_cm_isa.c sys/dev/netif/cs if_cs.c sys/dev/netif/dc if_dc.c sys/dev/netif/ed if_ed_isa.c if_ed_pccard.c if_ed_pci.c sys/dev/netif/em if_em.c sys/dev/netif/ep if_ep_pccard.c sys/dev/netif/ex if_ex_pccard.c sys/dev/netif/fe if_fe_pccard.c sys/dev/netif/fwe if_fwe.c sys/dev/netif/fxp if_fxp.c sys/dev/netif/gx if_gx.c sys/dev/netif/ipw if_ipw.c sys/dev/netif/iwi if_iwi.c sys/dev/netif/lge if_lge.c sys/dev/netif/lnc if_lnc_isa.c if_lnc_pci.c sys/dev/netif/my if_my.c sys/dev/netif/ndis if_ndis.c if_ndisvar.h sys/dev/netif/nge if_nge.c sys/dev/netif/nv if_nv.c sys/dev/netif/owi if_owi.c sys/dev/netif/pcn if_pcn.c sys/dev/netif/ray if_ray.c sys/dev/netif/re if_re.c sys/dev/netif/rl if_rl.c sys/dev/netif/sbsh if_sbsh.c sys/dev/netif/sf if_sf.c sys/dev/netif/sis if_sis.c sys/dev/netif/sk if_sk.c sys/dev/netif/sn if_sn.c if_sn_pccard.c sys/dev/netif/ste if_ste.c sys/dev/netif/ti if_ti.c sys/dev/netif/tl if_tl.c sys/dev/netif/tx if_tx.c sys/dev/netif/txp if_txp.c sys/dev/netif/vr if_vr.c sys/dev/netif/wb if_wb.c sys/dev/netif/wi if_wi.c sys/dev/netif/wl if_wl.c sys/dev/netif/xe if_xe.c sys/dev/netif/xl if_xl.c sys/emulation/ndis kern_ndis.c ndis_var.h subr_ndis.c sys/kern kern_intr.c sys/net/tap if_tap.c Log: MFC serializer fixes by Sepherosa Ziehau. Primarily reorder the call to ether_ifdetach and ieee80211_ifdetach and make the calls without holding the serializer to avoid a panic. Revision Changes Path 1.35.2.1 +3 -2 src/sys/dev/netif/an/if_an.c 1.14.2.1 +5 -1 src/sys/dev/netif/awi/if_awi_pccard.c 1.27.2.1 +6 -7 src/sys/dev/netif/bfe/if_bfe.c 1.51.2.1 +5 -9 src/sys/dev/netif/bge/if_bge.c 1.13.2.1 +3 -2 src/sys/dev/netif/cm/if_cm_isa.c 1.23.2.1 +4 -5 src/sys/dev/netif/cs/if_cs.c 1.47.2.2 +5 -7 src/sys/dev/netif/dc/if_dc.c 1.13.2.1 +6 -2 src/sys/dev/netif/ed/if_ed_isa.c 1.14.2.1 +6 -2 src/sys/dev/netif/ed/if_ed_pccard.c 1.10.2.1 +6 -2 src/sys/dev/netif/ed/if_ed_pci.c 1.45.2.1 +9 -9 src/sys/dev/netif/em/if_em.c 1.9.2.1 +9 -2 src/sys/dev/netif/ep/if_ep_pccard.c 1.10.2.1 +4 -3 src/sys/dev/netif/ex/if_ex_pccard.c 1.8.2.1 +3 -2 src/sys/dev/netif/fe/if_fe_pccard.c 1.23.2.1 +2 -1 src/sys/dev/netif/fwe/if_fwe.c 1.40.2.2 +7 -6 src/sys/dev/netif/fxp/if_fxp.c 1.22.2.1 +5 -7 src/sys/dev/netif/gx/if_gx.c 1.12.2.1 +17 -14 src/sys/dev/netif/ipw/if_ipw.c 1.9.2.1 +4 -5 src/sys/dev/netif/iwi/if_iwi.c 1.34.2.1 +4 -5 src/sys/dev/netif/lge/if_lge.c 1.7.2.1 +5 -7 src/sys/dev/netif/lnc/if_lnc_isa.c 1.8.2.1 +5 -7 src/sys/dev/netif/lnc/if_lnc_pci.c 1.23.2.1 +4 -6 src/sys/dev/netif/my/if_my.c 1.11.2.1 +18 -93 src/sys/dev/netif/ndis/if_ndis.c 1.2.4.1 +0 -10 src/sys/dev/netif/ndis/if_ndisvar.h 1.35.2.1 +4 -6 src/sys/dev/netif/nge/if_nge.c 1.24.2.1 +11 -6 src/sys/dev/netif/nv/if_nv.c 1.14.2.1 +4 -4 src/sys/dev/netif/owi/if_owi.c 1.27.2.2 +4 -6 src/sys/dev/netif/pcn/if_pcn.c 1.26.2.1 +9 -6 src/sys/dev/netif/ray/if_ray.c 1.20.2.1 +6 -7 src/sys/dev/netif/re/if_re.c 1.29.2.1 +4 -7 src/sys/dev/netif/rl/if_rl.c 1.22.2.1 +6 -7 src/sys/dev/netif/sbsh/if_sbsh.c 1.26.2.1 +5 -7 src/sys/dev/netif/sf/if_sf.c 1.30.2.1 +4 -5 src/sys/dev/netif/sis/if_sis.c 1.41.2.1 +13 -6 src/sys/dev/netif/sk/if_sk.c 1.24.2.1 +0 -3 src/sys/dev/netif/sn/if_sn.c 1.6.4.1 +7 -1 src/sys/dev/netif/sn/if_sn_pccard.c 1.32.2.1 +7 -12 src/sys/dev/netif/ste/if_ste.c 1.39.2.1 +5 -8 src/sys/dev/netif/ti/if_ti.c 1.34.2.1 +4 -5 src/sys/dev/netif/tl/if_tl.c 1.33.2.1 +7 -12 src/sys/dev/netif/tx/if_tx.c 1.34.2.1 +5 -8 src/sys/dev/netif/txp/if_txp.c 1.40.2.1 +4 -6 src/sys/dev/netif/vr/if_vr.c 1.33.2.1 +5 -7 src/sys/dev/netif/wb/if_wb.c 1.33.2.1 +3 -8 src/sys/dev/netif/wi/if_wi.c 1.26.2.1 +4 -3 src/sys/dev/netif/wl/if_wl.c 1.30.2.1 +7 -5 src/sys/dev/netif/xe/if_xe.c 1.42.2.1 +4 -6 src/sys/dev/netif/xl/if_xl.c 1.8.2.1 +0 -33 src/sys/emulation/ndis/kern_ndis.c 1.2.4.1 +0 -3 src/sys/emulation/ndis/ndis_var.h 1.9.2.1 +6 -6 src/sys/emulation/ndis/subr_ndis.c 1.38.2.2 +1 -1 src/sys/kern/kern_intr.c 1.23.2.1 +0 -2 src/sys/net/tap/if_tap.c http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/an/if_an.c.diff?r1=1.35&r2=1.35.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/awi/if_awi_pccard.c.diff?r1=1.14&r2=1.14.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/bfe/if_bfe.c.diff?r1=1.27&r2=1.27.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/bge/if_bge.c.diff?r1=1.51&r2=1.51.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/cm/if_cm_isa.c.diff?r1=1.13&r2=1.13.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/cs/if_cs.c.diff?r1=1.23&r2=1.23.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/dc/if_dc.c.diff?r1=1.47.2.1&r2=1.47.2.2&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/ed/if_ed_isa.c.diff?r1=1.13&r2=1.13.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/ed/if_ed_pccard.c.diff?r1=1.14&r2=1.14.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/ed/if_ed_pci.c.diff?r1=1.10&r2=1.10.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/em/if_em.c.diff?r1=1.45&r2=1.45.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/ep/if_ep_pccard.c.diff?r1=1.9&r2=1.9.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/ex/if_ex_pccard.c.diff?r1=1.10&r2=1.10.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/fe/if_fe_pccard.c.diff?r1=1.8&r2=1.8.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/fwe/if_fwe.c.diff?r1=1.23&r2=1.23.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/fxp/if_fxp.c.diff?r1=1.40.2.1&r2=1.40.2.2&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/gx/if_gx.c.diff?r1=1.22&r2=1.22.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/ipw/if_ipw.c.diff?r1=1.12&r2=1.12.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/iwi/if_iwi.c.diff?r1=1.9&r2=1.9.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/lge/if_lge.c.diff?r1=1.34&r2=1.34.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/lnc/if_lnc_isa.c.diff?r1=1.7&r2=1.7.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/lnc/if_lnc_pci.c.diff?r1=1.8&r2=1.8.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/my/if_my.c.diff?r1=1.23&r2=1.23.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/ndis/if_ndis.c.diff?r1=1.11&r2=1.11.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/ndis/if_ndisvar.h.diff?r1=1.2&r2=1.2.4.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/nge/if_nge.c.diff?r1=1.35&r2=1.35.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/nv/if_nv.c.diff?r1=1.24&r2=1.24.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/owi/if_owi.c.diff?r1=1.14&r2=1.14.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/pcn/if_pcn.c.diff?r1=1.27.2.1&r2=1.27.2.2&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/ray/if_ray.c.diff?r1=1.26&r2=1.26.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/re/if_re.c.diff?r1=1.20&r2=1.20.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/rl/if_rl.c.diff?r1=1.29&r2=1.29.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/sbsh/if_sbsh.c.diff?r1=1.22&r2=1.22.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/sf/if_sf.c.diff?r1=1.26&r2=1.26.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/sis/if_sis.c.diff?r1=1.30&r2=1.30.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/sk/if_sk.c.diff?r1=1.41&r2=1.41.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/sn/if_sn.c.diff?r1=1.24&r2=1.24.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/sn/if_sn_pccard.c.diff?r1=1.6&r2=1.6.4.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/ste/if_ste.c.diff?r1=1.32&r2=1.32.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/ti/if_ti.c.diff?r1=1.39&r2=1.39.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/tl/if_tl.c.diff?r1=1.34&r2=1.34.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/tx/if_tx.c.diff?r1=1.33&r2=1.33.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/txp/if_txp.c.diff?r1=1.34&r2=1.34.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/vr/if_vr.c.diff?r1=1.40&r2=1.40.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/wb/if_wb.c.diff?r1=1.33&r2=1.33.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/wi/if_wi.c.diff?r1=1.33&r2=1.33.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/wl/if_wl.c.diff?r1=1.26&r2=1.26.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/xe/if_xe.c.diff?r1=1.30&r2=1.30.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/xl/if_xl.c.diff?r1=1.42&r2=1.42.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/emulation/ndis/kern_ndis.c.diff?r1=1.8&r2=1.8.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/emulation/ndis/ndis_var.h.diff?r1=1.2&r2=1.2.4.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/emulation/ndis/subr_ndis.c.diff?r1=1.9&r2=1.9.2.1&f=u http://www.dragonflybsd.org/cvsweb/src/sys/kern/kern_intr.c.diff?r1=1.38.2.1&r2=1.38.2.2&f=u http://www.dragonflybsd.org/cvsweb/src/sys/net/tap/if_tap.c.diff?r1=1.23&r2=1.23.2.1&f=u