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
053dd217
Commit
053dd217
authored
Jul 29, 2006
by
Jeff Garzik
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'upstream-fixes' into upstream
parents
d7446c0b
4da3dcf3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
4 deletions
+13
-4
drivers/net/via-velocity.c
drivers/net/via-velocity.c
+13
-4
No files found.
drivers/net/via-velocity.c
View file @
053dd217
...
@@ -2742,7 +2742,7 @@ static u32 check_connection_type(struct mac_regs __iomem * regs)
...
@@ -2742,7 +2742,7 @@ static u32 check_connection_type(struct mac_regs __iomem * regs)
if
(
PHYSR0
&
PHYSR0_SPDG
)
if
(
PHYSR0
&
PHYSR0_SPDG
)
status
|=
VELOCITY_SPEED_1000
;
status
|=
VELOCITY_SPEED_1000
;
if
(
PHYSR0
&
PHYSR0_SPD10
)
else
if
(
PHYSR0
&
PHYSR0_SPD10
)
status
|=
VELOCITY_SPEED_10
;
status
|=
VELOCITY_SPEED_10
;
else
else
status
|=
VELOCITY_SPEED_100
;
status
|=
VELOCITY_SPEED_100
;
...
@@ -2851,8 +2851,17 @@ static int velocity_get_settings(struct net_device *dev, struct ethtool_cmd *cmd
...
@@ -2851,8 +2851,17 @@ static int velocity_get_settings(struct net_device *dev, struct ethtool_cmd *cmd
u32
status
;
u32
status
;
status
=
check_connection_type
(
vptr
->
mac_regs
);
status
=
check_connection_type
(
vptr
->
mac_regs
);
cmd
->
supported
=
SUPPORTED_TP
|
SUPPORTED_Autoneg
|
SUPPORTED_10baseT_Half
|
SUPPORTED_10baseT_Full
|
SUPPORTED_100baseT_Half
|
SUPPORTED_100baseT_Full
|
SUPPORTED_1000baseT_Half
|
SUPPORTED_1000baseT_Full
;
cmd
->
supported
=
SUPPORTED_TP
|
if
(
status
&
VELOCITY_SPEED_100
)
SUPPORTED_Autoneg
|
SUPPORTED_10baseT_Half
|
SUPPORTED_10baseT_Full
|
SUPPORTED_100baseT_Half
|
SUPPORTED_100baseT_Full
|
SUPPORTED_1000baseT_Half
|
SUPPORTED_1000baseT_Full
;
if
(
status
&
VELOCITY_SPEED_1000
)
cmd
->
speed
=
SPEED_1000
;
else
if
(
status
&
VELOCITY_SPEED_100
)
cmd
->
speed
=
SPEED_100
;
cmd
->
speed
=
SPEED_100
;
else
else
cmd
->
speed
=
SPEED_10
;
cmd
->
speed
=
SPEED_10
;
...
@@ -2896,7 +2905,7 @@ static u32 velocity_get_link(struct net_device *dev)
...
@@ -2896,7 +2905,7 @@ static u32 velocity_get_link(struct net_device *dev)
{
{
struct
velocity_info
*
vptr
=
netdev_priv
(
dev
);
struct
velocity_info
*
vptr
=
netdev_priv
(
dev
);
struct
mac_regs
__iomem
*
regs
=
vptr
->
mac_regs
;
struct
mac_regs
__iomem
*
regs
=
vptr
->
mac_regs
;
return
BYTE_REG_BITS_IS_ON
(
PHYSR0_LINKGD
,
&
regs
->
PHYSR0
)
?
0
:
1
;
return
BYTE_REG_BITS_IS_ON
(
PHYSR0_LINKGD
,
&
regs
->
PHYSR0
)
?
1
:
0
;
}
}
static
void
velocity_get_drvinfo
(
struct
net_device
*
dev
,
struct
ethtool_drvinfo
*
info
)
static
void
velocity_get_drvinfo
(
struct
net_device
*
dev
,
struct
ethtool_drvinfo
*
info
)
...
...
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