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
c6ebbb7e
Commit
c6ebbb7e
authored
Jan 06, 2005
by
David Dillow
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixup the version reporting to match 3Com.
Signed-off-by:
David Dillow
<
dave@thedillows.org
>
parent
c063385d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
drivers/net/typhoon.c
drivers/net/typhoon.c
+6
-3
No files found.
drivers/net/typhoon.c
View file @
c6ebbb7e
...
@@ -1072,8 +1072,10 @@ typhoon_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
...
@@ -1072,8 +1072,10 @@ typhoon_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
if
(
typhoon_issue_command
(
tp
,
1
,
&
xp_cmd
,
3
,
xp_resp
)
<
0
)
{
if
(
typhoon_issue_command
(
tp
,
1
,
&
xp_cmd
,
3
,
xp_resp
)
<
0
)
{
strcpy
(
info
->
fw_version
,
"Unknown runtime"
);
strcpy
(
info
->
fw_version
,
"Unknown runtime"
);
}
else
{
}
else
{
strncpy
(
info
->
fw_version
,
(
char
*
)
&
xp_resp
[
1
],
32
);
u32
sleep_ver
=
xp_resp
[
0
].
parm2
;
info
->
fw_version
[
31
]
=
0
;
snprintf
(
info
->
fw_version
,
32
,
"%02x.%03x.%03x"
,
sleep_ver
>>
24
,
(
sleep_ver
>>
12
)
&
0xfff
,
sleep_ver
&
0xfff
);
}
}
}
}
...
@@ -2592,7 +2594,8 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
...
@@ -2592,7 +2594,8 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
u8
*
ver_string
=
(
u8
*
)
&
xp_resp
[
1
];
u8
*
ver_string
=
(
u8
*
)
&
xp_resp
[
1
];
ver_string
[
25
]
=
0
;
ver_string
[
25
]
=
0
;
printk
(
KERN_INFO
"%s: Typhoon 1.1+ Sleep Image version "
printk
(
KERN_INFO
"%s: Typhoon 1.1+ Sleep Image version "
"%u.%u.%u.%u %s
\n
"
,
dev
->
name
,
HIPQUAD
(
sleep_ver
),
"%02x.%03x.%03x %s
\n
"
,
dev
->
name
,
sleep_ver
>>
24
,
(
sleep_ver
>>
12
)
&
0xfff
,
sleep_ver
&
0xfff
,
ver_string
);
ver_string
);
}
else
{
}
else
{
printk
(
KERN_WARNING
"%s: Unknown Sleep Image version "
printk
(
KERN_WARNING
"%s: Unknown Sleep Image version "
...
...
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