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
6d6585e4
Commit
6d6585e4
authored
Feb 27, 2006
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
parents
b9a33ceb
7bef4b39
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
drivers/net/sis900.c
drivers/net/sis900.c
+2
-2
No files found.
drivers/net/sis900.c
View file @
6d6585e4
...
@@ -540,7 +540,7 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
...
@@ -540,7 +540,7 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
printk
(
"%2.2x.
\n
"
,
net_dev
->
dev_addr
[
i
]);
printk
(
"%2.2x.
\n
"
,
net_dev
->
dev_addr
[
i
]);
/* Detect Wake on Lan support */
/* Detect Wake on Lan support */
ret
=
inl
(
CFGPMC
&
PMESP
)
;
ret
=
(
inl
(
net_dev
->
base_addr
+
CFGPMC
)
&
PMESP
)
>>
27
;
if
(
netif_msg_probe
(
sis_priv
)
&&
(
ret
&
PME_D3C
)
==
0
)
if
(
netif_msg_probe
(
sis_priv
)
&&
(
ret
&
PME_D3C
)
==
0
)
printk
(
KERN_INFO
"%s: Wake on LAN only available from suspend to RAM."
,
net_dev
->
name
);
printk
(
KERN_INFO
"%s: Wake on LAN only available from suspend to RAM."
,
net_dev
->
name
);
...
@@ -2040,7 +2040,7 @@ static int sis900_set_wol(struct net_device *net_dev, struct ethtool_wolinfo *wo
...
@@ -2040,7 +2040,7 @@ static int sis900_set_wol(struct net_device *net_dev, struct ethtool_wolinfo *wo
if
(
wol
->
wolopts
==
0
)
{
if
(
wol
->
wolopts
==
0
)
{
pci_read_config_dword
(
sis_priv
->
pci_dev
,
CFGPMCSR
,
&
cfgpmcsr
);
pci_read_config_dword
(
sis_priv
->
pci_dev
,
CFGPMCSR
,
&
cfgpmcsr
);
cfgpmcsr
|
=
~
PME_EN
;
cfgpmcsr
&
=
~
PME_EN
;
pci_write_config_dword
(
sis_priv
->
pci_dev
,
CFGPMCSR
,
cfgpmcsr
);
pci_write_config_dword
(
sis_priv
->
pci_dev
,
CFGPMCSR
,
cfgpmcsr
);
outl
(
pmctrl_bits
,
pmctrl_addr
);
outl
(
pmctrl_bits
,
pmctrl_addr
);
if
(
netif_msg_wol
(
sis_priv
))
if
(
netif_msg_wol
(
sis_priv
))
...
...
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