Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
349fb2d6
Commit
349fb2d6
authored
Mar 27, 2008
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
parents
50fd4407
9896322a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
5 deletions
+12
-5
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl-4965.c
+1
-1
drivers/net/wireless/libertas/if_cs.c
drivers/net/wireless/libertas/if_cs.c
+0
-2
drivers/net/wireless/rt2x00/rt2x00dev.c
drivers/net/wireless/rt2x00/rt2x00dev.c
+11
-2
No files found.
drivers/net/wireless/iwlwifi/iwl-4965.c
View file @
349fb2d6
...
...
@@ -4589,7 +4589,7 @@ static u8 iwl4965_is_fat_tx_allowed(struct iwl4965_priv *priv,
if
(
sta_ht_inf
)
{
if
((
!
sta_ht_inf
->
ht_supported
)
||
(
!
sta_ht_inf
->
cap
&
IEEE80211_HT_CAP_SUP_WIDTH
))
(
!
(
sta_ht_inf
->
cap
&
IEEE80211_HT_CAP_SUP_WIDTH
)
))
return
0
;
}
...
...
drivers/net/wireless/libertas/if_cs.c
View file @
349fb2d6
...
...
@@ -677,9 +677,7 @@ sbi_get_int_status_exit:
/* Card has a command result for us */
if
(
*
ireg
&
IF_CS_C_S_CMD_UPLD_RDY
)
{
spin_lock
(
&
priv
->
driver_lock
);
ret
=
if_cs_receive_cmdres
(
priv
,
priv
->
upld_buf
,
&
priv
->
upld_len
);
spin_unlock
(
&
priv
->
driver_lock
);
if
(
ret
<
0
)
lbs_pr_err
(
"could not receive cmd from card
\n
"
);
}
...
...
drivers/net/wireless/rt2x00/rt2x00dev.c
View file @
349fb2d6
...
...
@@ -1393,11 +1393,20 @@ int rt2x00lib_suspend(struct rt2x00_dev *rt2x00dev, pm_message_t state)
exit:
/*
* Set device mode to sleep for power management.
* Set device mode to sleep for power management,
* on some hardware this call seems to consistently fail.
* From the specifications it is hard to tell why it fails,
* and if this is a "bad thing".
* Overall it is safe to just ignore the failure and
* continue suspending. The only downside is that the
* device will not be in optimal power save mode, but with
* the radio and the other components already disabled the
* device is as good as disabled.
*/
retval
=
rt2x00dev
->
ops
->
lib
->
set_device_state
(
rt2x00dev
,
STATE_SLEEP
);
if
(
retval
)
return
retval
;
WARNING
(
rt2x00dev
,
"Device failed to enter sleep state, "
"continue suspending.
\n
"
);
return
0
;
}
...
...
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