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
nexedi
linux
Commits
1ed24d74
Commit
1ed24d74
authored
May 20, 2003
by
David S. Miller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[NET]: Use irqreturn_t in acenic driver.
parent
6be2745d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
drivers/net/acenic.c
drivers/net/acenic.c
+4
-2
drivers/net/acenic.h
drivers/net/acenic.h
+1
-1
No files found.
drivers/net/acenic.c
View file @
1ed24d74
...
...
@@ -2428,7 +2428,7 @@ static inline void ace_tx_int(struct net_device *dev,
}
static
void
ace_interrupt
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
ptregs
)
static
irqreturn_t
ace_interrupt
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
ptregs
)
{
struct
ace_private
*
ap
;
struct
ace_regs
*
regs
;
...
...
@@ -2446,7 +2446,7 @@ static void ace_interrupt(int irq, void *dev_id, struct pt_regs *ptregs)
* spending any time in here.
*/
if
(
!
(
readl
(
&
regs
->
HostCtrl
)
&
IN_INT
))
return
;
return
IRQ_NONE
;
/*
* ACK intr now. Otherwise we will lose updates to rx_ret_prd,
...
...
@@ -2552,6 +2552,8 @@ static void ace_interrupt(int irq, void *dev_id, struct pt_regs *ptregs)
tasklet_schedule
(
&
ap
->
ace_tasklet
);
}
}
return
IRQ_HANDLED
;
}
...
...
drivers/net/acenic.h
View file @
1ed24d74
...
...
@@ -781,7 +781,7 @@ static int ace_init(struct net_device *dev);
static
void
ace_load_std_rx_ring
(
struct
ace_private
*
ap
,
int
nr_bufs
);
static
void
ace_load_mini_rx_ring
(
struct
ace_private
*
ap
,
int
nr_bufs
);
static
void
ace_load_jumbo_rx_ring
(
struct
ace_private
*
ap
,
int
nr_bufs
);
static
void
ace_interrupt
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
regs
);
static
irqreturn_t
ace_interrupt
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
regs
);
static
int
ace_load_firmware
(
struct
net_device
*
dev
);
static
int
ace_open
(
struct
net_device
*
dev
);
static
int
ace_start_xmit
(
struct
sk_buff
*
skb
,
struct
net_device
*
dev
);
...
...
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