Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
a15707d8
cloud-kernel
项目概览
openanolis
/
cloud-kernel
大约 1 年 前同步成功
通知
153
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a15707d8
编写于
5月 10, 2010
作者:
R
Reinette Chatre
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'wireless-2.6' into wireless-next-2.6
Conflicts: drivers/net/wireless/iwlwifi/iwl-dev.h
上级
9459d59f
562db532
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
22 addition
and
1 deletion
+22
-1
drivers/net/wireless/ath/ar9170/usb.c
drivers/net/wireless/ath/ar9170/usb.c
+11
-0
drivers/net/wireless/ath/ar9170/usb.h
drivers/net/wireless/ath/ar9170/usb.h
+1
-0
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-agn.c
+6
-0
drivers/net/wireless/iwlwifi/iwl-dev.h
drivers/net/wireless/iwlwifi/iwl-dev.h
+2
-0
net/mac80211/mlme.c
net/mac80211/mlme.c
+2
-1
未找到文件。
drivers/net/wireless/ath/ar9170/usb.c
浏览文件 @
a15707d8
...
...
@@ -736,12 +736,16 @@ static void ar9170_usb_firmware_failed(struct ar9170_usb *aru)
{
struct
device
*
parent
=
aru
->
udev
->
dev
.
parent
;
complete
(
&
aru
->
firmware_loading_complete
);
/* unbind anything failed */
if
(
parent
)
down
(
&
parent
->
sem
);
device_release_driver
(
&
aru
->
udev
->
dev
);
if
(
parent
)
up
(
&
parent
->
sem
);
usb_put_dev
(
aru
->
udev
);
}
static
void
ar9170_usb_firmware_finish
(
const
struct
firmware
*
fw
,
void
*
context
)
...
...
@@ -770,6 +774,8 @@ static void ar9170_usb_firmware_finish(const struct firmware *fw, void *context)
if
(
err
)
goto
err_unrx
;
complete
(
&
aru
->
firmware_loading_complete
);
usb_put_dev
(
aru
->
udev
);
return
;
err_unrx:
...
...
@@ -867,6 +873,7 @@ static int ar9170_usb_probe(struct usb_interface *intf,
init_usb_anchor
(
&
aru
->
tx_pending
);
init_usb_anchor
(
&
aru
->
tx_submitted
);
init_completion
(
&
aru
->
cmd_wait
);
init_completion
(
&
aru
->
firmware_loading_complete
);
spin_lock_init
(
&
aru
->
tx_urb_lock
);
aru
->
tx_pending_urbs
=
0
;
...
...
@@ -886,6 +893,7 @@ static int ar9170_usb_probe(struct usb_interface *intf,
if
(
err
)
goto
err_freehw
;
usb_get_dev
(
aru
->
udev
);
return
request_firmware_nowait
(
THIS_MODULE
,
1
,
"ar9170.fw"
,
&
aru
->
udev
->
dev
,
GFP_KERNEL
,
aru
,
ar9170_usb_firmware_step2
);
...
...
@@ -905,6 +913,9 @@ static void ar9170_usb_disconnect(struct usb_interface *intf)
return
;
aru
->
common
.
state
=
AR9170_IDLE
;
wait_for_completion
(
&
aru
->
firmware_loading_complete
);
ar9170_unregister
(
&
aru
->
common
);
ar9170_usb_cancel_urbs
(
aru
);
...
...
drivers/net/wireless/ath/ar9170/usb.h
浏览文件 @
a15707d8
...
...
@@ -71,6 +71,7 @@ struct ar9170_usb {
unsigned
int
tx_pending_urbs
;
struct
completion
cmd_wait
;
struct
completion
firmware_loading_complete
;
int
readlen
;
u8
*
readbuf
;
...
...
drivers/net/wireless/iwlwifi/iwl-agn.c
浏览文件 @
a15707d8
...
...
@@ -1776,6 +1776,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
/* We have our copies now, allow OS release its copies */
release_firmware
(
ucode_raw
);
complete
(
&
priv
->
_agn
.
firmware_loading_complete
);
return
;
try_again:
...
...
@@ -1789,6 +1790,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
IWL_ERR
(
priv
,
"failed to allocate pci memory
\n
"
);
iwl_dealloc_ucode_pci
(
priv
);
out_unbind:
complete
(
&
priv
->
_agn
.
firmware_loading_complete
);
device_release_driver
(
&
priv
->
pci_dev
->
dev
);
release_firmware
(
ucode_raw
);
}
...
...
@@ -3586,6 +3588,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
iwl_power_initialize
(
priv
);
iwl_tt_initialize
(
priv
);
init_completion
(
&
priv
->
_agn
.
firmware_loading_complete
);
err
=
iwl_request_firmware
(
priv
,
true
);
if
(
err
)
goto
out_remove_sysfs
;
...
...
@@ -3626,6 +3630,8 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev)
if
(
!
priv
)
return
;
wait_for_completion
(
&
priv
->
_agn
.
firmware_loading_complete
);
IWL_DEBUG_INFO
(
priv
,
"*** UNLOAD DRIVER ***
\n
"
);
iwl_dbgfs_unregister
(
priv
);
...
...
drivers/net/wireless/iwlwifi/iwl-dev.h
浏览文件 @
a15707d8
...
...
@@ -1242,6 +1242,8 @@ struct iwl_priv {
struct
iwl_rx_phy_res
last_phy_res
;
bool
last_phy_res_valid
;
struct
completion
firmware_loading_complete
;
}
_agn
;
#endif
};
...
...
net/mac80211/mlme.c
浏览文件 @
a15707d8
...
...
@@ -2177,7 +2177,8 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
continue
;
if
(
wk
->
type
!=
IEEE80211_WORK_DIRECT_PROBE
&&
wk
->
type
!=
IEEE80211_WORK_AUTH
)
wk
->
type
!=
IEEE80211_WORK_AUTH
&&
wk
->
type
!=
IEEE80211_WORK_ASSOC
)
continue
;
if
(
memcmp
(
req
->
bss
->
bssid
,
wk
->
filter_ta
,
ETH_ALEN
))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录