From 0ed33a8df1dbc7ee9ff77139493a93824e9b34d1 Mon Sep 17 00:00:00 2001 From: glebius Date: Sun, 6 Nov 2005 19:43:04 +0000 Subject: [PATCH] - Do not raise IFF_DRV_OACTIVE flag in vlan_start, because this can lead to stalled interface - Explain this fact in a comment. Reviewed by: rwatson, thompsa, yar --- sys/net/if_vlan.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 009d0ca4f9ed..15a2a7900ecb 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -465,6 +465,14 @@ vlan_ifinit(void *foo) } +/* + * The if_start method for vlan(4) interface. It doesn't + * raises the IFF_DRV_OACTIVE flag, since it is called + * only from IFQ_HANDOFF() macro in ether_output_frame(). + * If the interface queue is full, and vlan_start() is + * not called, the queue would never get emptied and + * interface would stall forever. + */ static void vlan_start(struct ifnet *ifp) { @@ -477,7 +485,6 @@ vlan_start(struct ifnet *ifp) ifv = ifp->if_softc; p = ifv->ifv_p; - ifp->if_drv_flags |= IFF_DRV_OACTIVE; for (;;) { IF_DEQUEUE(&ifp->if_snd, m); if (m == 0) @@ -561,7 +568,6 @@ vlan_start(struct ifnet *ifp) else ifp->if_oerrors++; } - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; } static void