Ticket #7908: qdisc_debug.patch
| File qdisc_debug.patch, 2.2 KB (added by , 14 years ago) |
|---|
-
src/vboxhost/vboxnetflt/linux/VBoxNetFlt-linux.
old new 193 193 194 194 195 195 #ifdef VBOXNETFLT_WITH_QDISC 196 //#define QDISC_LOG(x) printk x197 # define QDISC_LOG(x) do { } while (0)196 #define QDISC_LOG(x) printk x 197 //# define QDISC_LOG(x) do { } while (0) 198 198 199 199 # if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20) 200 200 # define QDISC_CREATE(dev, queue, ops, parent) qdisc_create_dflt(dev, ops) … … 283 283 } 284 284 } 285 285 # endif /* VBOXNETFLT_QDISC_ENQUEUE */ 286 if (!pPriv->pChild->enqueue) 287 return NET_XMIT_DROP; 286 288 rc = pPriv->pChild->enqueue(skb, pPriv->pChild); 287 289 if (rc == NET_XMIT_SUCCESS) 288 290 { … … 307 309 PINTNETTRUNKSWPORT pSwitchPort; 308 310 struct sk_buff *pSkb; 309 311 310 QDISC_LOG(("vboxNetFltDequeue: Enter pThis=%p \n", pPriv->pVBoxNetFlt));312 QDISC_LOG(("vboxNetFltDequeue: Enter pThis=%p pChild=%p\n", pPriv->pVBoxNetFlt, pPriv->pChild)); 311 313 312 314 while ((pSkb = pPriv->pChild->dequeue(pPriv->pChild)) != NULL) 313 315 { … … 604 606 qdisc_destroy(pPriv->pChild); 605 607 pPriv->pChild = QDISC_GET(pDev); 606 608 atomic_inc(&pPriv->pChild->refcnt); 609 QDISC_LOG(("vboxNetFltLinuxInstallQdisc: about to replace %s (%p)\n", 610 pPriv->pChild->ops->id, pPriv->pChild)); 607 611 /* 608 612 * There is no need in deactivating the device or acquiring any locks 609 613 * prior changing qdiscs since we do not destroy the old qdisc. … … 692 696 while (QDISC_IS_BUSY(pDev, pQdisc)) 693 697 yield(); 694 698 qdisc_destroy(pQdisc); /* Destroy reference */ 699 QDISC_LOG(("vboxNetFltLinuxQdiscRemove: restored %s\n", pDev->qdisc_sleeping->ops->id)); 695 700 } 696 701 # else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) */ 697 702 for (i = 0; i < pDev->num_tx_queues; i++) … … 707 712 yield(); 708 713 qdisc_destroy(pQdisc); /* Destroy reference */ 709 714 } 715 QDISC_LOG(("vboxNetFltLinuxQdiscRemove: restored %s (#%d)\n", pQueue->qdisc_sleeping->ops->id, i)); 710 716 } 711 717 /* Newer kernels store root qdisc in netdev structure as well. */ 712 718 # if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 32)

