Changeset 30051 in vbox for trunk

Timestamp:

Jun 7, 2010 7:29:48 AM (15 years ago)

Author:

vboxsync

Message:

#4814: vboxnetflt qdisc: Older kernel fixes.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (modified) (4 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c

@@ -182 +182 @@
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27)
+#define qdisc_pkt_len(skb) (skb->len)
 #define QDISC_GET(dev) (dev->qdisc_sleeping)
 #else
@@ -336 +337 @@
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
+static int vboxNetFltQdiscRequeue(struct sk_buff *skb, struct Qdisc *sch)
+{
+    int rc;
+    PVBOXNETQDISCPRIV pPriv = qdisc_priv(sch);
+
+    rc = pPriv->pChild->ops->requeue(skb, pPriv->pChild);
+    if (rc == 0)
+    {
+        sch->q.qlen++;
+        sch->qstats.requeues++;
+    }
+
+    return rc;
+}
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) */
+
 static unsigned int vboxNetFltQdiscDrop(struct Qdisc *sch)
 {
@@ -413 +431 @@
     *ppOld = pPriv->pChild;
     pPriv->pChild = pNew;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
     qdisc_tree_decrease_qlen(*ppOld, (*ppOld)->q.qlen);
+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) */
+    sch->q.qlen = 0;
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) */
     qdisc_reset(*ppOld);
     sch_tree_unlock(sch);
@@ -498 +520 @@
     .enqueue   = vboxNetFltQdiscEnqueue,
     .dequeue   = vboxNetFltQdiscDequeue,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
+    .requeue   = vboxNetFltQdiscRequeue,
+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) */
     .peek      = qdisc_peek_dequeued,
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) */
     .drop      = vboxNetFltQdiscDrop,
     .init      = vboxNetFltQdiscInit,