diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-31 04:22:43 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-31 04:22:43 +0200 |
| commit | df597efb5737063497f1a4f7c996cc9aec294230 (patch) | |
| tree | 17bb60f68ee299d9717038197a932501625f1621 /drivers/net/eexpress.c | |
| parent | xfrm: select sane defaults for xfrm[4|6] gc_thresh (diff) | |
| parent | ixgbe: Fix RSC completion delay causing Rx interrupts to stop (diff) | |
| download | linux-df597efb5737063497f1a4f7c996cc9aec294230.tar.xz linux-df597efb5737063497f1a4f7c996cc9aec294230.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-3945.h
drivers/net/wireless/iwlwifi/iwl-tx.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
Diffstat (limited to 'drivers/net/eexpress.c')
| -rw-r--r-- | drivers/net/eexpress.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c index 8c44ef4ba357..d1b6368faacd 100644 --- a/drivers/net/eexpress.c +++ b/drivers/net/eexpress.c @@ -1474,13 +1474,13 @@ static void eexp_hw_init586(struct net_device *dev) outw(0x0000, ioaddr + 0x800c); outw(0x0000, ioaddr + 0x800e); - for (i = 0; i < (sizeof(start_code)); i+=32) { + for (i = 0; i < ARRAY_SIZE(start_code) * 2; i+=32) { int j; outw(i, ioaddr + SM_PTR); - for (j = 0; j < 16; j+=2) + for (j = 0; j < 16 && (i+j)/2 < ARRAY_SIZE(start_code); j+=2) outw(start_code[(i+j)/2], ioaddr+0x4000+j); - for (j = 0; j < 16; j+=2) + for (j = 0; j < 16 && (i+j+16)/2 < ARRAY_SIZE(start_code); j+=2) outw(start_code[(i+j+16)/2], ioaddr+0x8000+j); } |