Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Linux-御风守护者
linux
提交
12402b5b
L
linux
项目概览
Linux-御风守护者
/
linux
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
12402b5b
编写于
2月 05, 2009
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
上级
7b5e56f9
c4e061ac
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
7 addition
and
0 deletion
+7
-0
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-agn.c
+2
-0
drivers/net/wireless/iwlwifi/iwl-sta.c
drivers/net/wireless/iwlwifi/iwl-sta.c
+3
-0
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
+2
-0
未找到文件。
drivers/net/wireless/iwlwifi/iwl-agn.c
浏览文件 @
12402b5b
...
@@ -4042,6 +4042,7 @@ static int iwl_pci_suspend(struct pci_dev *pdev, pm_message_t state)
...
@@ -4042,6 +4042,7 @@ static int iwl_pci_suspend(struct pci_dev *pdev, pm_message_t state)
priv
->
is_open
=
1
;
priv
->
is_open
=
1
;
}
}
pci_save_state
(
pdev
);
pci_set_power_state
(
pdev
,
PCI_D3hot
);
pci_set_power_state
(
pdev
,
PCI_D3hot
);
return
0
;
return
0
;
...
@@ -4052,6 +4053,7 @@ static int iwl_pci_resume(struct pci_dev *pdev)
...
@@ -4052,6 +4053,7 @@ static int iwl_pci_resume(struct pci_dev *pdev)
struct
iwl_priv
*
priv
=
pci_get_drvdata
(
pdev
);
struct
iwl_priv
*
priv
=
pci_get_drvdata
(
pdev
);
pci_set_power_state
(
pdev
,
PCI_D0
);
pci_set_power_state
(
pdev
,
PCI_D0
);
pci_restore_state
(
pdev
);
if
(
priv
->
is_open
)
if
(
priv
->
is_open
)
iwl_mac_start
(
priv
->
hw
);
iwl_mac_start
(
priv
->
hw
);
...
...
drivers/net/wireless/iwlwifi/iwl-sta.c
浏览文件 @
12402b5b
...
@@ -480,6 +480,9 @@ void iwl_clear_stations_table(struct iwl_priv *priv)
...
@@ -480,6 +480,9 @@ void iwl_clear_stations_table(struct iwl_priv *priv)
priv
->
num_stations
=
0
;
priv
->
num_stations
=
0
;
memset
(
priv
->
stations
,
0
,
sizeof
(
priv
->
stations
));
memset
(
priv
->
stations
,
0
,
sizeof
(
priv
->
stations
));
/* clean ucode key table bit map */
priv
->
ucode_key_table
=
0
;
spin_unlock_irqrestore
(
&
priv
->
sta_lock
,
flags
);
spin_unlock_irqrestore
(
&
priv
->
sta_lock
,
flags
);
}
}
EXPORT_SYMBOL
(
iwl_clear_stations_table
);
EXPORT_SYMBOL
(
iwl_clear_stations_table
);
...
...
drivers/net/wireless/iwlwifi/iwl3945-base.c
浏览文件 @
12402b5b
...
@@ -8143,6 +8143,7 @@ static int iwl3945_pci_suspend(struct pci_dev *pdev, pm_message_t state)
...
@@ -8143,6 +8143,7 @@ static int iwl3945_pci_suspend(struct pci_dev *pdev, pm_message_t state)
priv
->
is_open
=
1
;
priv
->
is_open
=
1
;
}
}
pci_save_state
(
pdev
);
pci_set_power_state
(
pdev
,
PCI_D3hot
);
pci_set_power_state
(
pdev
,
PCI_D3hot
);
return
0
;
return
0
;
...
@@ -8153,6 +8154,7 @@ static int iwl3945_pci_resume(struct pci_dev *pdev)
...
@@ -8153,6 +8154,7 @@ static int iwl3945_pci_resume(struct pci_dev *pdev)
struct
iwl3945_priv
*
priv
=
pci_get_drvdata
(
pdev
);
struct
iwl3945_priv
*
priv
=
pci_get_drvdata
(
pdev
);
pci_set_power_state
(
pdev
,
PCI_D0
);
pci_set_power_state
(
pdev
,
PCI_D0
);
pci_restore_state
(
pdev
);
if
(
priv
->
is_open
)
if
(
priv
->
is_open
)
iwl3945_mac_start
(
priv
->
hw
);
iwl3945_mac_start
(
priv
->
hw
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录