Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
raspberrypi-kernel
提交
c4ff9486
R
raspberrypi-kernel
项目概览
openeuler
/
raspberrypi-kernel
通知
13
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
raspberrypi-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
c4ff9486
编写于
3月 27, 2013
作者:
J
John W. Linville
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'for-john' of
git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
上级
54683441
2d5d50ee
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
25 addition
and
3 deletion
+25
-3
drivers/net/wireless/iwlwifi/dvm/lib.c
drivers/net/wireless/iwlwifi/dvm/lib.c
+9
-0
drivers/net/wireless/iwlwifi/dvm/ucode.c
drivers/net/wireless/iwlwifi/dvm/ucode.c
+2
-2
drivers/net/wireless/iwlwifi/pcie/trans.c
drivers/net/wireless/iwlwifi/pcie/trans.c
+13
-0
drivers/net/wireless/iwlwifi/pcie/tx.c
drivers/net/wireless/iwlwifi/pcie/tx.c
+1
-1
未找到文件。
drivers/net/wireless/iwlwifi/dvm/lib.c
浏览文件 @
c4ff9486
...
...
@@ -1261,6 +1261,15 @@ int iwl_dvm_send_cmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
return
-
EIO
;
}
/*
* This can happen upon FW ASSERT: we clear the STATUS_FW_ERROR flag
* in iwl_down but cancel the workers only later.
*/
if
(
!
priv
->
ucode_loaded
)
{
IWL_ERR
(
priv
,
"Fw not loaded - dropping CMD: %x
\n
"
,
cmd
->
id
);
return
-
EIO
;
}
/*
* Synchronous commands from this op-mode must hold
* the mutex, this ensures we don't try to send two
...
...
drivers/net/wireless/iwlwifi/dvm/ucode.c
浏览文件 @
c4ff9486
...
...
@@ -367,6 +367,8 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv,
return
-
EIO
;
}
priv
->
ucode_loaded
=
true
;
if
(
ucode_type
!=
IWL_UCODE_WOWLAN
)
{
/* delay a bit to give rfkill time to run */
msleep
(
5
);
...
...
@@ -380,8 +382,6 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv,
return
ret
;
}
priv
->
ucode_loaded
=
true
;
return
0
;
}
...
...
drivers/net/wireless/iwlwifi/pcie/trans.c
浏览文件 @
c4ff9486
...
...
@@ -475,6 +475,10 @@ static int iwl_trans_pcie_start_fw(struct iwl_trans *trans,
/* If platform's RF_KILL switch is NOT set to KILL */
hw_rfkill
=
iwl_is_rfkill_set
(
trans
);
if
(
hw_rfkill
)
set_bit
(
STATUS_RFKILL
,
&
trans_pcie
->
status
);
else
clear_bit
(
STATUS_RFKILL
,
&
trans_pcie
->
status
);
iwl_op_mode_hw_rf_kill
(
trans
->
op_mode
,
hw_rfkill
);
if
(
hw_rfkill
&&
!
run_in_rfkill
)
return
-
ERFKILL
;
...
...
@@ -641,6 +645,7 @@ static int iwl_trans_pcie_d3_resume(struct iwl_trans *trans,
static
int
iwl_trans_pcie_start_hw
(
struct
iwl_trans
*
trans
)
{
struct
iwl_trans_pcie
*
trans_pcie
=
IWL_TRANS_GET_PCIE_TRANS
(
trans
);
bool
hw_rfkill
;
int
err
;
...
...
@@ -656,6 +661,10 @@ static int iwl_trans_pcie_start_hw(struct iwl_trans *trans)
iwl_enable_rfkill_int
(
trans
);
hw_rfkill
=
iwl_is_rfkill_set
(
trans
);
if
(
hw_rfkill
)
set_bit
(
STATUS_RFKILL
,
&
trans_pcie
->
status
);
else
clear_bit
(
STATUS_RFKILL
,
&
trans_pcie
->
status
);
iwl_op_mode_hw_rf_kill
(
trans
->
op_mode
,
hw_rfkill
);
return
0
;
...
...
@@ -694,6 +703,10 @@ static void iwl_trans_pcie_stop_hw(struct iwl_trans *trans,
* op_mode.
*/
hw_rfkill
=
iwl_is_rfkill_set
(
trans
);
if
(
hw_rfkill
)
set_bit
(
STATUS_RFKILL
,
&
trans_pcie
->
status
);
else
clear_bit
(
STATUS_RFKILL
,
&
trans_pcie
->
status
);
iwl_op_mode_hw_rf_kill
(
trans
->
op_mode
,
hw_rfkill
);
}
}
...
...
drivers/net/wireless/iwlwifi/pcie/tx.c
浏览文件 @
c4ff9486
...
...
@@ -1264,7 +1264,7 @@ static int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans,
for
(
i
=
0
;
i
<
IWL_MAX_CMD_TBS_PER_TFD
;
i
++
)
{
int
copy
=
0
;
if
(
!
cmd
->
len
)
if
(
!
cmd
->
len
[
i
]
)
continue
;
/* need at least IWL_HCMD_SCRATCHBUF_SIZE copied */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录