projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bnx2x: Using the new FW
[deliverable/linux.git]
/
drivers
/
net
/
eexpress.c
diff --git
a/drivers/net/eexpress.c
b/drivers/net/eexpress.c
index 1686dca2874865a7d012bbc39bd9d77c63b305eb..d1b6368faacd4e59835be3212981a3df954694bd 100644
(file)
--- a/
drivers/net/eexpress.c
+++ b/
drivers/net/eexpress.c
@@
-664,7
+664,7
@@
static int eexp_xmit(struct sk_buff *buf, struct net_device *dev)
if (buf->len < ETH_ZLEN) {
if (skb_padto(buf, ETH_ZLEN))
if (buf->len < ETH_ZLEN) {
if (skb_padto(buf, ETH_ZLEN))
- return
0
;
+ return
NETDEV_TX_OK
;
length = ETH_ZLEN;
}
length = ETH_ZLEN;
}
@@
-691,7
+691,7
@@
static int eexp_xmit(struct sk_buff *buf, struct net_device *dev)
spin_unlock_irqrestore(&lp->lock, flags);
#endif
enable_irq(dev->irq);
spin_unlock_irqrestore(&lp->lock, flags);
#endif
enable_irq(dev->irq);
- return
0
;
+ return
NETDEV_TX_OK
;
}
/*
}
/*
@@
-1474,13
+1474,13
@@
static void eexp_hw_init586(struct net_device *dev)
outw(0x0000, ioaddr + 0x800c);
outw(0x0000, ioaddr + 0x800e);
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);
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);
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);
}
outw(start_code[(i+j+16)/2],
ioaddr+0x8000+j);
}
This page took
0.025369 seconds
and
5
git commands to generate.