| From: | Matthew Dillon <dillon@xxxxxxxxxxxxxxxxxxxxxxx> |
| Date: | Mon, 21 Nov 2005 16:24:35 -0800 (PST) |
dillon 2005/11/21 16:24:35 PST
DragonFly src repository
Modified files:
sys/dev/netif/an if_an.c
sys/dev/netif/aue if_aue.c
sys/dev/netif/awi awi.c
sys/dev/netif/axe if_axe.c
sys/dev/netif/bfe if_bfe.c
sys/dev/netif/bge if_bge.c
sys/dev/netif/cs if_cs.c
sys/dev/netif/cue if_cue.c
sys/dev/netif/dc if_dc.c
sys/dev/netif/ed if_ed.c
sys/dev/netif/el if_el.c
sys/dev/netif/em if_em.c
sys/dev/netif/ep if_ep.c
sys/dev/netif/ex if_ex.c
sys/dev/netif/fe if_fe.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/ie if_ie.c
sys/dev/netif/ipw if_ipw.c
sys/dev/netif/iwi if_iwi.c
sys/dev/netif/kue if_kue.c
sys/dev/netif/le if_le.c
sys/dev/netif/lge if_lge.c
sys/dev/netif/lnc if_lnc.c
sys/dev/netif/my if_my.c
sys/dev/netif/ndis if_ndis.c
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/pdq_layer pdq.c
sys/dev/netif/ray if_ray.c
sys/dev/netif/rdp if_rdp.c
sys/dev/netif/re if_re.c
sys/dev/netif/rl if_rl.c
sys/dev/netif/rue if_rue.c
sys/dev/netif/sbni if_sbni.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
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/vx if_vx.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/net if.c if_loop.c ifq_var.h
sys/net/altq altq_cbq.c altq_hfsc.c altq_priq.c
altq_subr.c if_altq.h
sys/net/ppp if_ppp.c
sys/net/sl if_sl.c
sys/net/sppp if_spppsubr.c
sys/net/tap if_tap.c
sys/net/tun if_tun.c
sys/net/vlan if_vlan.c
Log:
Fix the design of ifq_dequeue/altq_dequeue by adding an mbuf pointer and
requiring that a polled mbuf be passed as an argument to the dequeue
function. Assert that the passed argument matches the mbuf that is actually
dequeued. Also remove assignments of the return value from ifq_dequeue()
in such cases which implied that the mbuf might be different when, in fact,
it had better not be.
Revision Changes Path
1.33 +2 -2 src/sys/dev/netif/an/if_an.c
1.28 +1 -1 src/sys/dev/netif/aue/if_aue.c
1.24 +1 -1 src/sys/dev/netif/awi/awi.c
1.18 +1 -1 src/sys/dev/netif/axe/if_axe.c
1.26 +1 -1 src/sys/dev/netif/bfe/if_bfe.c
1.49 +1 -1 src/sys/dev/netif/bge/if_bge.c
1.22 +1 -1 src/sys/dev/netif/cs/if_cs.c
1.23 +1 -1 src/sys/dev/netif/cue/if_cue.c
1.46 +26 -17 src/sys/dev/netif/dc/if_dc.c
1.27 +1 -1 src/sys/dev/netif/ed/if_ed.c
1.19 +1 -1 src/sys/dev/netif/el/if_el.c
1.43 +1 -1 src/sys/dev/netif/em/if_em.c
1.21 +2 -2 src/sys/dev/netif/ep/if_ep.c
1.20 +1 -1 src/sys/dev/netif/ex/if_ex.c
1.22 +1 -1 src/sys/dev/netif/fe/if_fe.c
1.22 +1 -1 src/sys/dev/netif/fwe/if_fwe.c
1.38 +2 -2 src/sys/dev/netif/fxp/if_fxp.c
1.21 +1 -1 src/sys/dev/netif/gx/if_gx.c
1.25 +1 -1 src/sys/dev/netif/ie/if_ie.c
1.10 +1 -1 src/sys/dev/netif/ipw/if_ipw.c
1.8 +1 -1 src/sys/dev/netif/iwi/if_iwi.c
1.17 +1 -1 src/sys/dev/netif/kue/if_kue.c
1.32 +2 -2 src/sys/dev/netif/le/if_le.c
1.32 +1 -1 src/sys/dev/netif/lge/if_lge.c
1.23 +1 -1 src/sys/dev/netif/lnc/if_lnc.c
1.22 +1 -1 src/sys/dev/netif/my/if_my.c
1.10 +1 -1 src/sys/dev/netif/ndis/if_ndis.c
1.33 +1 -1 src/sys/dev/netif/nge/if_nge.c
1.22 +1 -1 src/sys/dev/netif/nv/if_nv.c
1.12 +1 -1 src/sys/dev/netif/owi/if_owi.c
1.25 +1 -1 src/sys/dev/netif/pcn/if_pcn.c
1.6 +1 -1 src/sys/dev/netif/pdq_layer/pdq.c
1.25 +1 -1 src/sys/dev/netif/ray/if_ray.c
1.20 +1 -1 src/sys/dev/netif/rdp/if_rdp.c
1.18 +20 -8 src/sys/dev/netif/re/if_re.c
1.28 +1 -1 src/sys/dev/netif/rl/if_rl.c
1.4 +1 -1 src/sys/dev/netif/rue/if_rue.c
1.22 +1 -1 src/sys/dev/netif/sbni/if_sbni.c
1.21 +1 -1 src/sys/dev/netif/sbsh/if_sbsh.c
1.24 +1 -1 src/sys/dev/netif/sf/if_sf.c
1.29 +1 -1 src/sys/dev/netif/sis/if_sis.c
1.39 +1 -1 src/sys/dev/netif/sk/if_sk.c
1.23 +5 -5 src/sys/dev/netif/sn/if_sn.c
1.30 +1 -1 src/sys/dev/netif/ste/if_ste.c
1.37 +1 -1 src/sys/dev/netif/ti/if_ti.c
1.32 +1 -1 src/sys/dev/netif/tl/if_tl.c
1.32 +1 -1 src/sys/dev/netif/tx/if_tx.c
1.32 +1 -1 src/sys/dev/netif/txp/if_txp.c
1.39 +1 -1 src/sys/dev/netif/vr/if_vr.c
1.24 +2 -2 src/sys/dev/netif/vx/if_vx.c
1.32 +1 -1 src/sys/dev/netif/wb/if_wb.c
1.32 +1 -1 src/sys/dev/netif/wi/if_wi.c
1.25 +1 -1 src/sys/dev/netif/wl/if_wl.c
1.29 +1 -1 src/sys/dev/netif/xe/if_xe.c
1.41 +2 -2 src/sys/dev/netif/xl/if_xl.c
1.42 +3 -2 src/sys/net/if.c
1.18 +1 -1 src/sys/net/if_loop.c
1.5 +5 -5 src/sys/net/ifq_var.h
1.3 +3 -2 src/sys/net/altq/altq_cbq.c
1.5 +3 -2 src/sys/net/altq/altq_hfsc.c
1.5 +4 -2 src/sys/net/altq/altq_priq.c
1.6 +8 -6 src/sys/net/altq/altq_subr.c
1.2 +3 -12 src/sys/net/altq/if_altq.h
1.26 +1 -1 src/sys/net/ppp/if_ppp.c
1.20 +1 -1 src/sys/net/sl/if_sl.c
1.21 +1 -1 src/sys/net/sppp/if_spppsubr.c
1.21 +1 -4 src/sys/net/tap/if_tap.c
1.24 +1 -1 src/sys/net/tun/if_tun.c
1.17 +2 -2 src/sys/net/vlan/if_vlan.c
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/an/if_an.c.diff?r1=1.32&r2=1.33&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/aue/if_aue.c.diff?r1=1.27&r2=1.28&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/awi/awi.c.diff?r1=1.23&r2=1.24&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/axe/if_axe.c.diff?r1=1.17&r2=1.18&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/bfe/if_bfe.c.diff?r1=1.25&r2=1.26&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/bge/if_bge.c.diff?r1=1.48&r2=1.49&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/cs/if_cs.c.diff?r1=1.21&r2=1.22&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/cue/if_cue.c.diff?r1=1.22&r2=1.23&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/dc/if_dc.c.diff?r1=1.45&r2=1.46&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/ed/if_ed.c.diff?r1=1.26&r2=1.27&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/el/if_el.c.diff?r1=1.18&r2=1.19&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/em/if_em.c.diff?r1=1.42&r2=1.43&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/ep/if_ep.c.diff?r1=1.20&r2=1.21&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/ex/if_ex.c.diff?r1=1.19&r2=1.20&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/fe/if_fe.c.diff?r1=1.21&r2=1.22&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/fwe/if_fwe.c.diff?r1=1.21&r2=1.22&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/fxp/if_fxp.c.diff?r1=1.37&r2=1.38&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/gx/if_gx.c.diff?r1=1.20&r2=1.21&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/ie/if_ie.c.diff?r1=1.24&r2=1.25&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/ipw/if_ipw.c.diff?r1=1.9&r2=1.10&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/iwi/if_iwi.c.diff?r1=1.7&r2=1.8&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/kue/if_kue.c.diff?r1=1.16&r2=1.17&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/le/if_le.c.diff?r1=1.31&r2=1.32&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/lge/if_lge.c.diff?r1=1.31&r2=1.32&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/lnc/if_lnc.c.diff?r1=1.22&r2=1.23&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/my/if_my.c.diff?r1=1.21&r2=1.22&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/ndis/if_ndis.c.diff?r1=1.9&r2=1.10&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/nge/if_nge.c.diff?r1=1.32&r2=1.33&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/nv/if_nv.c.diff?r1=1.21&r2=1.22&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/owi/if_owi.c.diff?r1=1.11&r2=1.12&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/pcn/if_pcn.c.diff?r1=1.24&r2=1.25&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/pdq_layer/pdq.c.diff?r1=1.5&r2=1.6&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/ray/if_ray.c.diff?r1=1.24&r2=1.25&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/rdp/if_rdp.c.diff?r1=1.19&r2=1.20&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/re/if_re.c.diff?r1=1.17&r2=1.18&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/rl/if_rl.c.diff?r1=1.27&r2=1.28&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/rue/if_rue.c.diff?r1=1.3&r2=1.4&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/sbni/if_sbni.c.diff?r1=1.21&r2=1.22&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/sbsh/if_sbsh.c.diff?r1=1.20&r2=1.21&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/sf/if_sf.c.diff?r1=1.23&r2=1.24&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/sis/if_sis.c.diff?r1=1.28&r2=1.29&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/sk/if_sk.c.diff?r1=1.38&r2=1.39&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/sn/if_sn.c.diff?r1=1.22&r2=1.23&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/ste/if_ste.c.diff?r1=1.29&r2=1.30&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/ti/if_ti.c.diff?r1=1.36&r2=1.37&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/tl/if_tl.c.diff?r1=1.31&r2=1.32&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/tx/if_tx.c.diff?r1=1.31&r2=1.32&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/txp/if_txp.c.diff?r1=1.31&r2=1.32&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/vr/if_vr.c.diff?r1=1.38&r2=1.39&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/vx/if_vx.c.diff?r1=1.23&r2=1.24&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/wb/if_wb.c.diff?r1=1.31&r2=1.32&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/wi/if_wi.c.diff?r1=1.31&r2=1.32&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/wl/if_wl.c.diff?r1=1.24&r2=1.25&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/xe/if_xe.c.diff?r1=1.28&r2=1.29&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/xl/if_xl.c.diff?r1=1.40&r2=1.41&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/net/if.c.diff?r1=1.41&r2=1.42&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/net/if_loop.c.diff?r1=1.17&r2=1.18&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/net/ifq_var.h.diff?r1=1.4&r2=1.5&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/net/altq/altq_cbq.c.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/net/altq/altq_hfsc.c.diff?r1=1.4&r2=1.5&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/net/altq/altq_priq.c.diff?r1=1.4&r2=1.5&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/net/altq/altq_subr.c.diff?r1=1.5&r2=1.6&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/net/altq/if_altq.h.diff?r1=1.1&r2=1.2&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/net/ppp/if_ppp.c.diff?r1=1.25&r2=1.26&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/net/sl/if_sl.c.diff?r1=1.19&r2=1.20&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/net/sppp/if_spppsubr.c.diff?r1=1.20&r2=1.21&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/net/tap/if_tap.c.diff?r1=1.20&r2=1.21&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/net/tun/if_tun.c.diff?r1=1.23&r2=1.24&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/net/vlan/if_vlan.c.diff?r1=1.16&r2=1.17&f=u