Changeset 30059 in vbox for trunk

Timestamp:

Jun 7, 2010 9:21:41 AM (15 years ago)

Author:

vboxsync

Message:

#4814: vboxnetflt qdisc: More fixes for older kernels.

File:

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

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

@@ -182 +182 @@
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27)
+#define qdisc_dev(qdisc) (qdisc->dev)
 #define qdisc_pkt_len(skb) (skb->len)
 #define QDISC_GET(dev) (dev->qdisc_sleeping)
@@ -197 +198 @@
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27)
-#define QDISC_IS_BUSY(dev, qdisc)  test_bit(__LINK_STATE_SCHED, &dev->state))
+#define QDISC_IS_BUSY(dev, qdisc)  test_bit(__LINK_STATE_SCHED, &dev->state)
 #else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) */
 #define QDISC_IS_BUSY(dev, qdisc) (test_bit(__QDISC_STATE_RUNNING, &qdisc->state) || \
@@ -366 +367 @@
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)
+static int vboxNetFltQdiscInit(struct Qdisc *sch, struct rtattr *opt)
+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) */
 static int vboxNetFltQdiscInit(struct Qdisc *sch, struct nlattr *opt)
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) */
 {
     PVBOXNETQDISCPRIV pPriv = qdisc_priv(sch);
@@ -432 +437 @@
     pPriv->pChild = pNew;
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
+    sch->q.qlen = 0;
+#else /* 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);
@@ -457 +462 @@
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)
+static int vboxNetFltClassChange(struct Qdisc *sch, u32 classid, u32 parentid,
+                                 struct rtattr **tca, unsigned long *arg)
+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) */
 static int vboxNetFltClassChange(struct Qdisc *sch, u32 classid, u32 parentid,
                                  struct nlattr **tca, unsigned long *arg)
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) */
 {
     return -ENOSYS;
@@ -500 +510 @@
 
 
-static const struct Qdisc_class_ops g_VBoxNetFltClassOps =
+static struct Qdisc_class_ops g_VBoxNetFltClassOps =
 {
     .graft     = vboxNetFltClassGraft,
@@ -514 +524 @@
 
 
-struct Qdisc_ops g_VBoxNetFltQDiscOps = {
+static struct Qdisc_ops g_VBoxNetFltQDiscOps = {
     .cl_ops    = &g_VBoxNetFltClassOps,
     .id        = "vboxnetflt",
@@ -544 +554 @@
 static void vboxNetFltLinuxQdiscInstall(PVBOXNETFLTINS pThis, struct net_device *pDev)
 {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
     int i;
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) */
     PVBOXNETQDISCPRIV pPriv;
 
@@ -613 +625 @@
 static void vboxNetFltLinuxQdiscRemove(PVBOXNETFLTINS pThis, struct net_device *pDev)
 {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
     int i;
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) */
     PVBOXNETQDISCPRIV pPriv;
     struct Qdisc *pQdisc;