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
6b9c2957
Commit
6b9c2957
authored
21 years ago
by
Stephen Hemminger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[NET]: Fix boot param string setup in Space.c
parent
89808b34
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
14 deletions
+18
-14
drivers/net/Space.c
drivers/net/Space.c
+8
-6
drivers/net/wan/sbni.c
drivers/net/wan/sbni.c
+10
-8
No files found.
drivers/net/Space.c
View file @
6b9c2957
...
...
@@ -103,7 +103,7 @@ extern int de620_probe(struct net_device *);
extern
int
iph5526_probe
(
struct
net_device
*
dev
);
/* SBNI adapters */
extern
int
sbni_probe
(
void
);
extern
int
sbni_probe
(
int
unit
);
struct
devprobe
{
...
...
@@ -338,7 +338,7 @@ static struct devprobe mips_probes[] __initdata = {
* per bus interface. This drives the legacy devices only for now.
*/
static
int
__init
ethif_probe
(
void
)
static
int
__init
ethif_probe
(
int
unit
)
{
struct
net_device
*
dev
;
int
err
=
-
ENODEV
;
...
...
@@ -347,6 +347,7 @@ static int __init ethif_probe(void)
if
(
!
dev
)
return
-
ENOMEM
;
sprintf
(
dev
->
name
,
"eth%d"
,
unit
);
netdev_boot_setup_check
(
dev
);
/*
...
...
@@ -383,7 +384,7 @@ extern int sk_isa_probe(struct net_device *);
extern
int
proteon_probe
(
struct
net_device
*
);
extern
int
smctr_probe
(
struct
net_device
*
);
static
__init
int
trif_probe
(
void
)
static
__init
int
trif_probe
(
int
unit
)
{
struct
net_device
*
dev
;
int
err
=
-
ENODEV
;
...
...
@@ -392,6 +393,7 @@ static __init int trif_probe(void)
if
(
!
dev
)
return
-
ENOMEM
;
sprintf
(
dev
->
name
,
"tr%d"
,
unit
);
netdev_boot_setup_check
(
dev
);
if
(
#ifdef CONFIG_IBMTR
...
...
@@ -435,16 +437,16 @@ void __init probe_old_netdevs(void)
#ifdef CONFIG_SBNI
for
(
num
=
0
;
num
<
8
;
++
num
)
if
(
sbni_probe
())
if
(
sbni_probe
(
num
))
break
;
#endif
#ifdef CONFIG_TR
for
(
num
=
0
;
num
<
8
;
++
num
)
if
(
trif_probe
())
if
(
trif_probe
(
num
))
break
;
#endif
for
(
num
=
0
;
num
<
8
;
++
num
)
if
(
ethif_probe
())
if
(
ethif_probe
(
num
))
break
;
#ifdef CONFIG_COPS
cops_probe
(
0
);
...
...
This diff is collapsed.
Click to expand it.
drivers/net/wan/sbni.c
View file @
6b9c2957
...
...
@@ -221,24 +221,26 @@ static void __init sbni_devsetup(struct net_device *dev)
SET_MODULE_OWNER
(
dev
);
}
int
__init
sbni_probe
(
void
)
int
__init
sbni_probe
(
int
unit
)
{
struct
net_device
*
dev
;
static
unsigned
version_printed
__initdata
=
0
;
int
err
;
if
(
version_printed
++
==
0
)
printk
(
KERN_INFO
"%s"
,
version
);
dev
=
alloc_netdev
(
sizeof
(
struct
net_local
),
"sbni%d"
,
sbni_devsetup
);
dev
=
alloc_netdev
(
sizeof
(
struct
net_local
),
"sbni"
,
sbni_devsetup
);
if
(
!
dev
)
return
-
ENOMEM
;
sprintf
(
dev
->
name
,
"sbni%d"
,
unit
);
netdev_boot_setup_check
(
dev
);
if
(
register_netdev
(
dev
))
{
kfree
(
dev
);
return
-
ENODEV
;
err
=
register_netdev
(
dev
);
if
(
err
)
{
free_netdev
(
dev
);
return
err
;
}
if
(
version_printed
++
==
0
)
printk
(
KERN_INFO
"%s"
,
version
);
return
0
;
}
...
...
This diff is collapsed.
Click to expand it.
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