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
752e2bd2
Commit
752e2bd2
authored
May 23, 2002
by
Russell King
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ARM] Make etherh.c build again - combine struct ei_device inside our
own device specific structure.
parent
ec6afd8a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
5 deletions
+9
-5
drivers/acorn/net/etherh.c
drivers/acorn/net/etherh.c
+9
-5
No files found.
drivers/acorn/net/etherh.c
View file @
752e2bd2
...
...
@@ -66,6 +66,7 @@ static const card_ids __init etherh_cids[] = {
};
struct
etherh_priv
{
struct
ei_device
eidev
;
unsigned
int
id
;
unsigned
int
ctrl_port
;
unsigned
int
ctrl
;
...
...
@@ -150,8 +151,8 @@ static expansioncard_ops_t etherh_ops = {
static
void
etherh_setif
(
struct
net_device
*
dev
)
{
struct
e
i_device
*
ei_local
=
(
struct
ei_device
*
)
dev
->
priv
;
struct
e
therh_priv
*
eh
=
(
struct
etherh_priv
*
)
dev
->
rmem_start
;
struct
e
therh_priv
*
eh
=
(
struct
etherh_priv
*
)
dev
->
priv
;
struct
e
i_device
*
ei_local
=
&
eh
->
eidev
;
unsigned
long
addr
,
flags
;
local_irq_save
(
flags
);
...
...
@@ -194,8 +195,8 @@ etherh_setif(struct net_device *dev)
static
int
etherh_getifstat
(
struct
net_device
*
dev
)
{
struct
e
i_device
*
ei_local
=
(
struct
ei_device
*
)
dev
->
priv
;
struct
e
therh_priv
*
eh
=
(
struct
etherh_priv
*
)
dev
->
rmem_start
;
struct
e
therh_priv
*
eh
=
(
struct
etherh_priv
*
)
dev
->
priv
;
struct
e
i_device
*
ei_local
=
&
eh
->
eidev
;
int
stat
=
0
;
switch
(
eh
->
id
)
{
...
...
@@ -560,6 +561,9 @@ static struct net_device * __init etherh_init_one(struct expansion_card *ec)
if
(
!
eh
)
goto
out_nopriv
;
memset
(
eh
,
0
,
sizeof
(
struct
etherh_priv
));
spin_lock_init
(
&
eh
->
eidev
.
page_lock
);
SET_MODULE_OWNER
(
dev
);
dev
->
open
=
etherh_open
;
...
...
@@ -567,7 +571,7 @@ static struct net_device * __init etherh_init_one(struct expansion_card *ec)
dev
->
set_config
=
etherh_set_config
;
dev
->
irq
=
ec
->
irq
;
dev
->
base_addr
=
ecard_address
(
ec
,
ECARD_MEMC
,
0
);
dev
->
rmem_start
=
(
unsigned
long
)
eh
;
dev
->
priv
=
eh
;
/*
* IRQ and control port handling
...
...
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