Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
78d41b35
cloud-kernel
项目概览
openanolis
/
cloud-kernel
1 年多 前同步成功
通知
160
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
78d41b35
编写于
5月 11, 2011
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
上级
9bbc052d
2ae1b8b3
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
29 addition
and
2 deletion
+29
-2
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/ath9k/main.c
+8
-0
drivers/net/wireless/iwlegacy/iwl-core.c
drivers/net/wireless/iwlegacy/iwl-core.c
+7
-0
drivers/net/wireless/iwlegacy/iwl-dev.h
drivers/net/wireless/iwlegacy/iwl-dev.h
+6
-0
drivers/net/wireless/libertas/cmd.c
drivers/net/wireless/libertas/cmd.c
+4
-2
net/mac80211/tx.c
net/mac80211/tx.c
+4
-0
未找到文件。
drivers/net/wireless/ath/ath9k/main.c
浏览文件 @
78d41b35
...
...
@@ -2141,6 +2141,8 @@ static void ath9k_set_coverage_class(struct ieee80211_hw *hw, u8 coverage_class)
static
void
ath9k_flush
(
struct
ieee80211_hw
*
hw
,
bool
drop
)
{
struct
ath_softc
*
sc
=
hw
->
priv
;
struct
ath_hw
*
ah
=
sc
->
sc_ah
;
struct
ath_common
*
common
=
ath9k_hw_common
(
ah
);
int
timeout
=
200
;
/* ms */
int
i
,
j
;
...
...
@@ -2149,6 +2151,12 @@ static void ath9k_flush(struct ieee80211_hw *hw, bool drop)
cancel_delayed_work_sync
(
&
sc
->
tx_complete_work
);
if
(
sc
->
sc_flags
&
SC_OP_INVALID
)
{
ath_dbg
(
common
,
ATH_DBG_ANY
,
"Device not present
\n
"
);
mutex_unlock
(
&
sc
->
mutex
);
return
;
}
if
(
drop
)
timeout
=
1
;
...
...
drivers/net/wireless/iwlegacy/iwl-core.c
浏览文件 @
78d41b35
...
...
@@ -2155,6 +2155,13 @@ int iwl_legacy_mac_config(struct ieee80211_hw *hw, u32 changed)
goto
set_ch_out
;
}
if
(
priv
->
iw_mode
==
NL80211_IFTYPE_ADHOC
&&
!
iwl_legacy_is_channel_ibss
(
ch_info
))
{
IWL_DEBUG_MAC80211
(
priv
,
"leave - not IBSS channel
\n
"
);
ret
=
-
EINVAL
;
goto
set_ch_out
;
}
spin_lock_irqsave
(
&
priv
->
lock
,
flags
);
for_each_context
(
priv
,
ctx
)
{
...
...
drivers/net/wireless/iwlegacy/iwl-dev.h
浏览文件 @
78d41b35
...
...
@@ -1411,6 +1411,12 @@ iwl_legacy_is_channel_passive(const struct iwl_channel_info *ch)
return
(
!
(
ch
->
flags
&
EEPROM_CHANNEL_ACTIVE
))
?
1
:
0
;
}
static
inline
int
iwl_legacy_is_channel_ibss
(
const
struct
iwl_channel_info
*
ch
)
{
return
(
ch
->
flags
&
EEPROM_CHANNEL_IBSS
)
?
1
:
0
;
}
static
inline
void
__iwl_legacy_free_pages
(
struct
iwl_priv
*
priv
,
struct
page
*
page
)
{
...
...
drivers/net/wireless/libertas/cmd.c
浏览文件 @
78d41b35
...
...
@@ -1339,8 +1339,8 @@ int lbs_execute_next_command(struct lbs_private *priv)
cpu_to_le16
(
PS_MODE_ACTION_EXIT_PS
))
{
lbs_deb_host
(
"EXEC_NEXT_CMD: ignore ENTER_PS cmd
\n
"
);
list_del
(
&
cmdnode
->
list
);
spin_lock_irqsave
(
&
priv
->
driver_lock
,
flags
);
list_del
(
&
cmdnode
->
list
);
lbs_complete_command
(
priv
,
cmdnode
,
0
);
spin_unlock_irqrestore
(
&
priv
->
driver_lock
,
flags
);
...
...
@@ -1352,8 +1352,8 @@ int lbs_execute_next_command(struct lbs_private *priv)
(
priv
->
psstate
==
PS_STATE_PRE_SLEEP
))
{
lbs_deb_host
(
"EXEC_NEXT_CMD: ignore EXIT_PS cmd in sleep
\n
"
);
list_del
(
&
cmdnode
->
list
);
spin_lock_irqsave
(
&
priv
->
driver_lock
,
flags
);
list_del
(
&
cmdnode
->
list
);
lbs_complete_command
(
priv
,
cmdnode
,
0
);
spin_unlock_irqrestore
(
&
priv
->
driver_lock
,
flags
);
priv
->
needtowakeup
=
1
;
...
...
@@ -1366,7 +1366,9 @@ int lbs_execute_next_command(struct lbs_private *priv)
"EXEC_NEXT_CMD: sending EXIT_PS
\n
"
);
}
}
spin_lock_irqsave
(
&
priv
->
driver_lock
,
flags
);
list_del
(
&
cmdnode
->
list
);
spin_unlock_irqrestore
(
&
priv
->
driver_lock
,
flags
);
lbs_deb_host
(
"EXEC_NEXT_CMD: sending command 0x%04x
\n
"
,
le16_to_cpu
(
cmd
->
command
));
lbs_submit_command
(
priv
,
cmdnode
);
...
...
net/mac80211/tx.c
浏览文件 @
78d41b35
...
...
@@ -237,6 +237,10 @@ ieee80211_tx_h_dynamic_ps(struct ieee80211_tx_data *tx)
&
local
->
dynamic_ps_disable_work
);
}
/* Don't restart the timer if we're not disassociated */
if
(
!
ifmgd
->
associated
)
return
TX_CONTINUE
;
mod_timer
(
&
local
->
dynamic_ps_timer
,
jiffies
+
msecs_to_jiffies
(
local
->
hw
.
conf
.
dynamic_ps_timeout
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录