diff options
author | Jeff Garzik | 2005-06-26 23:11:03 +0200 |
---|---|---|
committer | Jeff Garzik | 2005-06-26 23:11:03 +0200 |
commit | 8b0ee07e108b2eefdab5bb73f33223f18926c3b2 (patch) | |
tree | f68ca04180c5488301a40ec212ef2eb2467cf56c /drivers/net/tulip/tulip_core.c | |
parent | [PATCH] smc91c92_cs: Reduce stack usage in smc91c92_event() (diff) | |
parent | Merge 'drm-3264' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
download | kernel-qcow2-linux-8b0ee07e108b2eefdab5bb73f33223f18926c3b2.tar.gz kernel-qcow2-linux-8b0ee07e108b2eefdab5bb73f33223f18926c3b2.tar.xz kernel-qcow2-linux-8b0ee07e108b2eefdab5bb73f33223f18926c3b2.zip |
Merge upstream (approx. 2.6.12-git8) into 'janitor' branch of netdev-2.6.
Diffstat (limited to 'drivers/net/tulip/tulip_core.c')
-rw-r--r-- | drivers/net/tulip/tulip_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c index d098b3ba3538..e0ae3ed6e578 100644 --- a/drivers/net/tulip/tulip_core.c +++ b/drivers/net/tulip/tulip_core.c @@ -1104,7 +1104,7 @@ static void set_rx_mode(struct net_device *dev) if (entry != 0) { /* Avoid a chip errata by prefixing a dummy entry. Don't do this on the ULI526X as it triggers a different problem */ - if (!(tp->chip_id == ULI526X && (tp->revision = 0x40 || tp->revision == 0x50))) { + if (!(tp->chip_id == ULI526X && (tp->revision == 0x40 || tp->revision == 0x50))) { tp->tx_buffers[entry].skb = NULL; tp->tx_buffers[entry].mapping = 0; tp->tx_ring[entry].length = |