Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index f5166dccd8df..e3bad8247fd1 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -992,6 +992,7 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
          * features
          */
         dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_HIGHDMA;
+        dev->vlan_features = dev->features;
 
         dev->irq = pdev->irq;
 
@@ -1092,10 +1093,11 @@ err_out:
 static void __devexit rtl8139_remove_one (struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata (pdev);
+        struct rtl8139_private *tp = netdev_priv(dev);
 
         assert (dev != NULL);
 
-        flush_scheduled_work();
+        cancel_delayed_work_sync(&tp->thread);
 
         unregister_netdev (dev);