From 67966f138e9e4f10634ce2a7ceffda5f6758f4e3 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 22 Oct 2006 21:00:33 -0700 Subject: [PATCH] --- yaml --- r: 40198 b: refs/heads/master c: 4e8a5201506423e0241202de1349422af4260296 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pci/quirks.c | 4 ++-- trunk/net/sched/sch_netem.c | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index aa8fdd00164a..ab41fe9edfec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a43487f43fbd4e03c606dcb62b98374a3af88fc +refs/heads/master: 4e8a5201506423e0241202de1349422af4260296 diff --git a/trunk/drivers/pci/quirks.c b/trunk/drivers/pci/quirks.c index e8a7f1b1b2bc..ecf8e4d6b9da 100644 --- a/trunk/drivers/pci/quirks.c +++ b/trunk/drivers/pci/quirks.c @@ -1634,7 +1634,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1 * is marked here since the boot video device will be the only enabled * video device at this point. */ - +#if 0 static void __devinit fixup_video(struct pci_dev *pdev) { struct pci_dev *bridge; @@ -1663,7 +1663,7 @@ static void __devinit fixup_video(struct pci_dev *pdev) } } DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, fixup_video); - +#endif static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end) { diff --git a/trunk/net/sched/sch_netem.c b/trunk/net/sched/sch_netem.c index 45939bafbdf8..ef8874babf6a 100644 --- a/trunk/net/sched/sch_netem.c +++ b/trunk/net/sched/sch_netem.c @@ -170,6 +170,8 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch) return NET_XMIT_BYPASS; } + skb_orphan(skb); + /* * If we need to duplicate packet, then re-insert at top of the * qdisc tree, since parent queuer expects that only one