Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
be41f5c7
C
clone-Linux
项目概览
gsplhtlxg
/
clone-Linux
通知
2
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
clone-Linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
be41f5c7
编写于
2月 26, 2010
作者:
J
John W. Linville
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'wireless-2.6' of
git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
上级
64463da9
89612124
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
8 addition
and
4 deletion
+8
-4
drivers/net/wireless/iwlwifi/iwl-commands.h
drivers/net/wireless/iwlwifi/iwl-commands.h
+1
-0
drivers/net/wireless/iwlwifi/iwl-tx.c
drivers/net/wireless/iwlwifi/iwl-tx.c
+7
-4
未找到文件。
drivers/net/wireless/iwlwifi/iwl-commands.h
浏览文件 @
be41f5c7
...
@@ -2623,6 +2623,7 @@ struct iwl_ssid_ie {
...
@@ -2623,6 +2623,7 @@ struct iwl_ssid_ie {
#define TX_CMD_LIFE_TIME_INFINITE cpu_to_le32(0xFFFFFFFF)
#define TX_CMD_LIFE_TIME_INFINITE cpu_to_le32(0xFFFFFFFF)
#define IWL_GOOD_CRC_TH cpu_to_le16(1)
#define IWL_GOOD_CRC_TH cpu_to_le16(1)
#define IWL_MAX_SCAN_SIZE 1024
#define IWL_MAX_SCAN_SIZE 1024
#define IWL_MAX_CMD_SIZE 4096
#define IWL_MAX_PROBE_REQUEST 200
#define IWL_MAX_PROBE_REQUEST 200
/*
/*
...
...
drivers/net/wireless/iwlwifi/iwl-tx.c
浏览文件 @
be41f5c7
...
@@ -364,7 +364,7 @@ int iwl_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq,
...
@@ -364,7 +364,7 @@ int iwl_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq,
for
(
i
=
0
;
i
<
actual_slots
;
i
++
)
{
for
(
i
=
0
;
i
<
actual_slots
;
i
++
)
{
/* only happens for cmd queue */
/* only happens for cmd queue */
if
(
i
==
slots_num
)
if
(
i
==
slots_num
)
len
+=
IWL_MAX_SCAN
_SIZE
;
len
=
IWL_MAX_CMD
_SIZE
;
txq
->
cmd
[
i
]
=
kmalloc
(
len
,
GFP_KERNEL
);
txq
->
cmd
[
i
]
=
kmalloc
(
len
,
GFP_KERNEL
);
if
(
!
txq
->
cmd
[
i
])
if
(
!
txq
->
cmd
[
i
])
...
@@ -1023,9 +1023,12 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
...
@@ -1023,9 +1023,12 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
/* If any of the command structures end up being larger than
/* If any of the command structures end up being larger than
* the TFD_MAX_PAYLOAD_SIZE, and it sent as a 'small' command then
* the TFD_MAX_PAYLOAD_SIZE, and it sent as a 'small' command then
* we will need to increase the size of the TFD entries */
* we will need to increase the size of the TFD entries
* Also, check to see if command buffer should not exceed the size
* of device_cmd and max_cmd_size. */
BUG_ON
((
fix_size
>
TFD_MAX_PAYLOAD_SIZE
)
&&
BUG_ON
((
fix_size
>
TFD_MAX_PAYLOAD_SIZE
)
&&
!
(
cmd
->
flags
&
CMD_SIZE_HUGE
));
!
(
cmd
->
flags
&
CMD_SIZE_HUGE
));
BUG_ON
(
fix_size
>
IWL_MAX_CMD_SIZE
);
if
(
iwl_is_rfkill
(
priv
)
||
iwl_is_ctkill
(
priv
))
{
if
(
iwl_is_rfkill
(
priv
)
||
iwl_is_ctkill
(
priv
))
{
IWL_WARN
(
priv
,
"Not sending command - %s KILL
\n
"
,
IWL_WARN
(
priv
,
"Not sending command - %s KILL
\n
"
,
...
@@ -1069,8 +1072,8 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
...
@@ -1069,8 +1072,8 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
if
(
cmd
->
flags
&
CMD_SIZE_HUGE
)
if
(
cmd
->
flags
&
CMD_SIZE_HUGE
)
out_cmd
->
hdr
.
sequence
|=
SEQ_HUGE_FRAME
;
out_cmd
->
hdr
.
sequence
|=
SEQ_HUGE_FRAME
;
len
=
sizeof
(
struct
iwl_device_cmd
);
len
=
sizeof
(
struct
iwl_device_cmd
);
len
+=
(
idx
==
TFD_CMD_SLOTS
)
?
IWL_MAX_SCAN_SIZE
:
0
;
if
(
idx
==
TFD_CMD_SLOTS
)
len
=
IWL_MAX_CMD_SIZE
;
#ifdef CONFIG_IWLWIFI_DEBUG
#ifdef CONFIG_IWLWIFI_DEBUG
switch
(
out_cmd
->
hdr
.
cmd
)
{
switch
(
out_cmd
->
hdr
.
cmd
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录