projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
USB: sierra: add more checks on shutdown
[powerpc.git]
/
drivers
/
net
/
ewrk3.c
diff --git
a/drivers/net/ewrk3.c
b/drivers/net/ewrk3.c
index
c8c41f0
..
cb0792c
100644
(file)
--- a/
drivers/net/ewrk3.c
+++ b/
drivers/net/ewrk3.c
@@
-414,10
+414,9
@@
ewrk3_hw_init(struct net_device *dev, u_long iobase)
icr &= 0x70;
outb(icr, EWRK3_ICR); /* Disable all the IRQs */
icr &= 0x70;
outb(icr, EWRK3_ICR); /* Disable all the IRQs */
- if (nicsr
=
= (CSR_TXD | CSR_RXD))
+ if (nicsr
!
= (CSR_TXD | CSR_RXD))
return -ENXIO;
return -ENXIO;
-
/* Check that the EEPROM is alive and well and not living on Pluto... */
for (chksum = 0, i = 0; i < EEPROM_MAX; i += 2) {
union {
/* Check that the EEPROM is alive and well and not living on Pluto... */
for (chksum = 0, i = 0; i < EEPROM_MAX; i += 2) {
union {
@@
-994,7
+993,6
@@
static int ewrk3_rx(struct net_device *dev)
if ((skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
unsigned char *p;
if ((skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
unsigned char *p;
- skb->dev = dev;
skb_reserve(skb, 2); /* Align to 16 bytes */
p = skb_put(skb, pkt_len);
skb_reserve(skb, 2); /* Align to 16 bytes */
p = skb_put(skb, pkt_len);