Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
ffdab3e5
Commit
ffdab3e5
authored
Jul 24, 2002
by
Alan Cox
Committed by
Linus Torvalds
Jul 24, 2002
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] Make the tulip compile again
parent
3b798793
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
drivers/net/tulip/de2104x.c
drivers/net/tulip/de2104x.c
+1
-1
drivers/net/tulip/de4x5.c
drivers/net/tulip/de4x5.c
+2
-2
drivers/net/tulip/winbond-840.c
drivers/net/tulip/winbond-840.c
+1
-1
No files found.
drivers/net/tulip/de2104x.c
View file @
ffdab3e5
...
@@ -2178,7 +2178,7 @@ static int de_suspend (struct pci_dev *pdev, u32 state)
...
@@ -2178,7 +2178,7 @@ static int de_suspend (struct pci_dev *pdev, u32 state)
/* Update the error counts. */
/* Update the error counts. */
__de_get_stats
(
de
);
__de_get_stats
(
de
);
synchronize_irq
();
synchronize_irq
(
dev
->
irq
);
de_clean_rings
(
de
);
de_clean_rings
(
de
);
de_adapter_sleep
(
de
);
de_adapter_sleep
(
de
);
...
...
drivers/net/tulip/de4x5.c
View file @
ffdab3e5
...
@@ -1522,7 +1522,7 @@ de4x5_sw_reset(struct net_device *dev)
...
@@ -1522,7 +1522,7 @@ de4x5_sw_reset(struct net_device *dev)
outl
(
omr
|
OMR_ST
,
DE4X5_OMR
);
outl
(
omr
|
OMR_ST
,
DE4X5_OMR
);
/* Poll for setup frame completion (adapter interrupts are disabled now) */
/* Poll for setup frame completion (adapter interrupts are disabled now) */
sti
();
/* Ensure timer interrupts */
for
(
j
=
0
,
i
=
0
;(
i
<
500
)
&&
(
j
==
0
);
i
++
)
{
/* Upto 500ms delay */
for
(
j
=
0
,
i
=
0
;(
i
<
500
)
&&
(
j
==
0
);
i
++
)
{
/* Upto 500ms delay */
mdelay
(
1
);
mdelay
(
1
);
if
((
s32
)
le32_to_cpu
(
lp
->
tx_ring
[
lp
->
tx_new
].
status
)
>=
0
)
j
=
1
;
if
((
s32
)
le32_to_cpu
(
lp
->
tx_ring
[
lp
->
tx_new
].
status
)
>=
0
)
j
=
1
;
...
@@ -1644,7 +1644,7 @@ de4x5_interrupt(int irq, void *dev_id, struct pt_regs *regs)
...
@@ -1644,7 +1644,7 @@ de4x5_interrupt(int irq, void *dev_id, struct pt_regs *regs)
if
(
test_and_set_bit
(
MASK_INTERRUPTS
,
(
void
*
)
&
lp
->
interrupt
))
if
(
test_and_set_bit
(
MASK_INTERRUPTS
,
(
void
*
)
&
lp
->
interrupt
))
printk
(
"%s: Re-entering the interrupt handler.
\n
"
,
dev
->
name
);
printk
(
"%s: Re-entering the interrupt handler.
\n
"
,
dev
->
name
);
synchronize_irq
();
synchronize_irq
(
dev
->
irq
);
for
(
limit
=
0
;
limit
<
8
;
limit
++
)
{
for
(
limit
=
0
;
limit
<
8
;
limit
++
)
{
sts
=
inl
(
DE4X5_STS
);
/* Read IRQ status */
sts
=
inl
(
DE4X5_STS
);
/* Read IRQ status */
...
...
drivers/net/tulip/winbond-840.c
View file @
ffdab3e5
...
@@ -1674,7 +1674,7 @@ static int w840_suspend (struct pci_dev *pdev, u32 state)
...
@@ -1674,7 +1674,7 @@ static int w840_suspend (struct pci_dev *pdev, u32 state)
spin_unlock_irq
(
&
np
->
lock
);
spin_unlock_irq
(
&
np
->
lock
);
spin_unlock_wait
(
&
dev
->
xmit_lock
);
spin_unlock_wait
(
&
dev
->
xmit_lock
);
synchronize_irq
();
synchronize_irq
(
dev
->
irq
);
np
->
stats
.
rx_missed_errors
+=
readl
(
ioaddr
+
RxMissed
)
&
0xffff
;
np
->
stats
.
rx_missed_errors
+=
readl
(
ioaddr
+
RxMissed
)
&
0xffff
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment