Merge branch 'upstream-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6 into upstream-fixes

2 files changed, 13 insertions, 12 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 86b8641b4664..72d3447fb99b 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -166,13 +166,14 @@ config NET_SB1000
           If you don't have this card, of course say N.
 
 config IP1000
-       tristate "IP1000 Gigabit Ethernet support"
-       depends on PCI && EXPERIMENTAL
-       ---help---
-         This driver supports IP1000 gigabit Ethernet cards.
+        tristate "IP1000 Gigabit Ethernet support"
+        depends on PCI && EXPERIMENTAL
+        select MII
+        ---help---
+          This driver supports IP1000 gigabit Ethernet cards.
 
-         To compile this driver as a module, choose M here: the module
-         will be called ipg.  This is recommended.
+          To compile this driver as a module, choose M here: the module
+          will be called ipg.  This is recommended.
 
 source "drivers/net/arcnet/Kconfig"
 
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index e8960f294a6e..b94fa7ef1955 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -392,7 +392,9 @@ struct rtl8169_private {
         void __iomem *mmio_addr;        /* memory map physical address */
         struct pci_dev *pci_dev;        /* Index of PCI device */
         struct net_device *dev;
+#ifdef CONFIG_R8169_NAPI
         struct napi_struct napi;
+#endif
         spinlock_t lock;                /* spin lock flag */
         u32 msg_enable;
         int chipset;
@@ -2989,13 +2991,16 @@ static void rtl8169_down(struct net_device *dev)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
         void __iomem *ioaddr = tp->mmio_addr;
-        unsigned int poll_locked = 0;
         unsigned int intrmask;
 
         rtl8169_delete_timer(dev);
 
         netif_stop_queue(dev);
 
+#ifdef CONFIG_R8169_NAPI
+        napi_disable(&tp->napi);
+#endif
+
 core_down:
         spin_lock_irq(&tp->lock);
 
@@ -3009,11 +3014,6 @@ core_down:
 
         synchronize_irq(dev->irq);
 
-        if (!poll_locked) {
-                napi_disable(&tp->napi);
-                poll_locked++;
-        }
-
         /* Give a racing hard_start_xmit a few cycles to complete. */
         synchronize_sched();  /* FIXME: should this be synchronize_irq()? */