Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
b4496d44
cloud-kernel
项目概览
openanolis
/
cloud-kernel
12 个月 前同步成功
通知
152
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,发现更多精彩内容 >>
提交
b4496d44
编写于
6月 04, 2008
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
上级
b9031d9d
4546002c
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
40 addition
and
15 deletion
+40
-15
drivers/net/wireless/airo.c
drivers/net/wireless/airo.c
+1
-1
drivers/net/wireless/b43legacy/main.c
drivers/net/wireless/b43legacy/main.c
+9
-8
drivers/net/wireless/ipw2200.c
drivers/net/wireless/ipw2200.c
+25
-2
drivers/net/wireless/libertas/debugfs.c
drivers/net/wireless/libertas/debugfs.c
+2
-2
drivers/net/wireless/p54/p54usb.c
drivers/net/wireless/p54/p54usb.c
+1
-0
drivers/ssb/driver_pcicore.c
drivers/ssb/driver_pcicore.c
+2
-2
未找到文件。
drivers/net/wireless/airo.c
浏览文件 @
b4496d44
...
...
@@ -2905,7 +2905,7 @@ EXPORT_SYMBOL(init_airo_card);
static
int
waitbusy
(
struct
airo_info
*
ai
)
{
int
delay
=
0
;
while
((
IN4500
(
ai
,
COMMAND
)
&
COMMAND_BUSY
)
&&
(
delay
<
10000
))
{
while
((
IN4500
(
ai
,
COMMAND
)
&
COMMAND_BUSY
)
&&
(
delay
<
10000
))
{
udelay
(
10
);
if
((
++
delay
%
20
)
==
0
)
OUT4500
(
ai
,
EVACK
,
EV_CLEARCOMMANDBUSY
);
...
...
drivers/net/wireless/b43legacy/main.c
浏览文件 @
b4496d44
...
...
@@ -3039,7 +3039,6 @@ static void b43legacy_set_pretbtt(struct b43legacy_wldev *dev)
/* Locking: wl->mutex */
static
void
b43legacy_wireless_core_exit
(
struct
b43legacy_wldev
*
dev
)
{
struct
b43legacy_wl
*
wl
=
dev
->
wl
;
struct
b43legacy_phy
*
phy
=
&
dev
->
phy
;
u32
macctl
;
...
...
@@ -3054,12 +3053,6 @@ static void b43legacy_wireless_core_exit(struct b43legacy_wldev *dev)
macctl
|=
B43legacy_MACCTL_PSM_JMP0
;
b43legacy_write32
(
dev
,
B43legacy_MMIO_MACCTL
,
macctl
);
mutex_unlock
(
&
wl
->
mutex
);
/* Must unlock as it would otherwise deadlock. No races here.
* Cancel possibly pending workqueues. */
cancel_work_sync
(
&
dev
->
restart_work
);
mutex_lock
(
&
wl
->
mutex
);
b43legacy_leds_exit
(
dev
);
b43legacy_rng_exit
(
dev
->
wl
);
b43legacy_pio_free
(
dev
);
...
...
@@ -3486,6 +3479,8 @@ static void b43legacy_chip_reset(struct work_struct *work)
}
}
out:
if
(
err
)
wl
->
current_dev
=
NULL
;
/* Failed to init the dev. */
mutex_unlock
(
&
wl
->
mutex
);
if
(
err
)
b43legacyerr
(
wl
,
"Controller restart FAILED
\n
"
);
...
...
@@ -3618,9 +3613,11 @@ static void b43legacy_one_core_detach(struct ssb_device *dev)
struct
b43legacy_wldev
*
wldev
;
struct
b43legacy_wl
*
wl
;
/* Do not cancel ieee80211-workqueue based work here.
* See comment in b43legacy_remove(). */
wldev
=
ssb_get_drvdata
(
dev
);
wl
=
wldev
->
wl
;
cancel_work_sync
(
&
wldev
->
restart_work
);
b43legacy_debugfs_remove_device
(
wldev
);
b43legacy_wireless_core_detach
(
wldev
);
list_del
(
&
wldev
->
list
);
...
...
@@ -3789,6 +3786,10 @@ static void b43legacy_remove(struct ssb_device *dev)
struct
b43legacy_wl
*
wl
=
ssb_get_devtypedata
(
dev
);
struct
b43legacy_wldev
*
wldev
=
ssb_get_drvdata
(
dev
);
/* We must cancel any work here before unregistering from ieee80211,
* as the ieee80211 unreg will destroy the workqueue. */
cancel_work_sync
(
&
wldev
->
restart_work
);
B43legacy_WARN_ON
(
!
wl
);
if
(
wl
->
current_dev
==
wldev
)
ieee80211_unregister_hw
(
wl
->
hw
);
...
...
drivers/net/wireless/ipw2200.c
浏览文件 @
b4496d44
...
...
@@ -7558,8 +7558,31 @@ static int ipw_associate(void *data)
priv
->
ieee
->
iw_mode
==
IW_MODE_ADHOC
&&
priv
->
config
&
CFG_ADHOC_CREATE
&&
priv
->
config
&
CFG_STATIC_ESSID
&&
priv
->
config
&
CFG_STATIC_CHANNEL
&&
!
list_empty
(
&
priv
->
ieee
->
network_free_list
))
{
priv
->
config
&
CFG_STATIC_CHANNEL
)
{
/* Use oldest network if the free list is empty */
if
(
list_empty
(
&
priv
->
ieee
->
network_free_list
))
{
struct
ieee80211_network
*
oldest
=
NULL
;
struct
ieee80211_network
*
target
;
DECLARE_MAC_BUF
(
mac
);
list_for_each_entry
(
target
,
&
priv
->
ieee
->
network_list
,
list
)
{
if
((
oldest
==
NULL
)
||
(
target
->
last_scanned
<
oldest
->
last_scanned
))
oldest
=
target
;
}
/* If there are no more slots, expire the oldest */
list_del
(
&
oldest
->
list
);
target
=
oldest
;
IPW_DEBUG_ASSOC
(
"Expired '%s' (%s) from "
"network list.
\n
"
,
escape_essid
(
target
->
ssid
,
target
->
ssid_len
),
print_mac
(
mac
,
target
->
bssid
));
list_add_tail
(
&
target
->
list
,
&
priv
->
ieee
->
network_free_list
);
}
element
=
priv
->
ieee
->
network_free_list
.
next
;
network
=
list_entry
(
element
,
struct
ieee80211_network
,
list
);
ipw_adhoc_create
(
priv
,
network
);
...
...
drivers/net/wireless/libertas/debugfs.c
浏览文件 @
b4496d44
...
...
@@ -312,8 +312,8 @@ static ssize_t lbs_threshold_write(uint16_t tlv_type, uint16_t event_mask,
if
(
tlv_type
!=
TLV_TYPE_BCNMISS
)
tlv
->
freq
=
freq
;
/* The command header, the
event mask, and the
one TLV */
events
->
hdr
.
size
=
cpu_to_le16
(
sizeof
(
events
->
hdr
)
+
2
+
sizeof
(
*
tlv
));
/* The command header, the
action, the event mask, and
one TLV */
events
->
hdr
.
size
=
cpu_to_le16
(
sizeof
(
events
->
hdr
)
+
4
+
sizeof
(
*
tlv
));
ret
=
lbs_cmd_with_response
(
priv
,
CMD_802_11_SUBSCRIBE_EVENT
,
events
);
...
...
drivers/net/wireless/p54/p54usb.c
浏览文件 @
b4496d44
...
...
@@ -49,6 +49,7 @@ static struct usb_device_id p54u_table[] __devinitdata = {
{
USB_DEVICE
(
0x5041
,
0x2235
)},
/* Linksys WUSB54G Portable */
/* Version 2 devices (3887) */
{
USB_DEVICE
(
0x0471
,
0x1230
)},
/* Philips CPWUA054/00 */
{
USB_DEVICE
(
0x050d
,
0x7050
)},
/* Belkin F5D7050 ver 1000 */
{
USB_DEVICE
(
0x0572
,
0x2000
)},
/* Cohiba Proto board */
{
USB_DEVICE
(
0x0572
,
0x2002
)},
/* Cohiba Proto board */
...
...
drivers/ssb/driver_pcicore.c
浏览文件 @
b4496d44
...
...
@@ -537,12 +537,12 @@ int ssb_pcicore_dev_irqvecs_enable(struct ssb_pcicore *pc,
int
err
=
0
;
u32
tmp
;
might_sleep
();
if
(
!
pdev
)
goto
out
;
bus
=
pdev
->
bus
;
might_sleep_if
(
pdev
->
id
.
coreid
!=
SSB_DEV_PCI
);
/* Enable interrupts for this device. */
if
(
bus
->
host_pci
&&
((
pdev
->
id
.
revision
>=
6
)
||
(
pdev
->
id
.
coreid
==
SSB_DEV_PCIE
)))
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录