Page MenuHomeFreeBSD
Files F141002833

D31647.diff
No OneTemporary
Actions

D31647.diff
View Options

diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -305,6 +305,10 @@
static int vlan_setflags(struct ifnet *ifp, int status);
static int vlan_setmulti(struct ifnet *ifp);
static int vlan_transmit(struct ifnet *ifp, struct mbuf *m);
+#ifdef ALTQ
+static void vlan_altq_start(struct ifnet *ifp);
+static int vlan_altq_transmit(struct ifnet *ifp, struct mbuf *m);
+#endif
static int vlan_output(struct ifnet *ifp, struct mbuf *m,
const struct sockaddr *dst, struct route *ro);
static void vlan_unconfig(struct ifnet *ifp);
@@ -1097,7 +1101,15 @@
ifp->if_dunit = unit;
ifp->if_init = vlan_init;
+#ifdef ALTQ
+ ifp->if_start = vlan_altq_start;
+ ifp->if_transmit = vlan_altq_transmit;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ ifp->if_snd.ifq_drv_maxlen = 0;
+ IFQ_SET_READY(&ifp->if_snd);
+#else
ifp->if_transmit = vlan_transmit;
+#endif
ifp->if_qflush = vlan_qflush;
ifp->if_ioctl = vlan_ioctl;
#if defined(KERN_TLS) || defined(RATELIMIT)
@@ -1150,6 +1162,9 @@
if (ifp->if_vlantrunk)
return (EBUSY);
+#ifdef ALTQ
+ IFQ_PURGE(&ifp->if_snd);
+#endif
ether_ifdetach(ifp); /* first, remove it from system-wide lists */
vlan_unconfig(ifp); /* now it can be unconfigured and freed */
/*
@@ -1271,6 +1286,38 @@
return p->if_output(ifp, m, dst, ro);
}
+#ifdef ALTQ
+static void
+vlan_altq_start(if_t ifp)
+{
+ struct ifaltq *ifq = &ifp->if_snd;
+ struct mbuf *m;
+
+ IFQ_LOCK(ifq);
+ IFQ_DEQUEUE_NOLOCK(ifq, m);
+ while (m != NULL) {
+ vlan_transmit(ifp, m);
+ IFQ_DEQUEUE_NOLOCK(ifq, m);
+ }
+ IFQ_UNLOCK(ifq);
+}
+
+static int
+vlan_altq_transmit(if_t ifp, struct mbuf *m)
+{
+ int err;
+
+ if (ALTQ_IS_ENABLED(&ifp->if_snd)) {
+ IFQ_ENQUEUE(&ifp->if_snd, m, err);
+ if (err == 0)
+ vlan_altq_start(ifp);
+ } else
+ err = vlan_transmit(ifp, m);
+
+ return (err);
+}
+#endif /* ALTQ */
+
/*
* The ifp->if_qflush entry point for vlan(4) is a no-op.
*/

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 31, 3:25 PM (1 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27415035
Default Alt Text
D31647.diff (1 KB)

Event Timeline