diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-17 16:13:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-17 16:13:25 -0700 |
| commit | 9676489866a75fdd56b0d3e40ec7884298bb1338 (patch) | |
| tree | 75cbfb35f4e09ad15b8753191b566d401d86de56 /drivers/net/sky2.c | |
| parent | 15eb7105a74a0a5d72d006fec2192b0ec692b5cc (diff) | |
| parent | 843a46f423a508b3a443a08baa903c6da02f3297 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/netdev-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/netdev-2.6:
sky2: prevent dual port receiver problems
x86_64: Check for bad dma address in b44 1GB DMA workaround
The ixp2000 driver for the enp2611 was developed on a board with
Diffstat (limited to 'drivers/net/sky2.c')
| -rw-r--r-- | drivers/net/sky2.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index ffd267fab21..62be6d99d05 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -1020,8 +1020,19 @@ static int sky2_up(struct net_device *dev) struct sky2_hw *hw = sky2->hw; unsigned port = sky2->port; u32 ramsize, rxspace, imask; - int err = -ENOMEM; + int err; + struct net_device *otherdev = hw->dev[sky2->port^1]; + /* Block bringing up both ports at the same time on a dual port card. + * There is an unfixed bug where receiver gets confused and picks up + * packets out of order. Until this is fixed, prevent data corruption. + */ + if (otherdev && netif_running(otherdev)) { + printk(KERN_INFO PFX "dual port support is disabled.\n"); + return -EBUSY; + } + + err = -ENOMEM; if (netif_msg_ifup(sky2)) printk(KERN_INFO PFX "%s: enabling interface\n", dev->name); |