Skip to content

Commit

Permalink
Merge branch 'upstream-jeff' of git://git.kernel.org/pub/scm/linux/ke…
Browse files Browse the repository at this point in the history
…rnel/git/romieu/netdev-2.6 into upstream-fixes
  • Loading branch information
Jeff Garzik committed Oct 29, 2007
2 parents 3830de7 + d141786 commit af09005
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
13 changes: 7 additions & 6 deletions drivers/net/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
12 changes: 6 additions & 6 deletions drivers/net/r8169.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand All @@ -3009,11 +3014,6 @@ static void rtl8169_down(struct net_device *dev)

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()? */

Expand Down

0 comments on commit af09005

Please sign in to comment.