Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
bb7b2284
K
Kernel
项目概览
openeuler
/
Kernel
12 个月 前同步成功
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
bb7b2284
编写于
11月 06, 2009
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
上级
539054a8
66f84d65
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
25 addition
and
25 deletion
+25
-25
drivers/net/wireless/ipw2x00/ipw2100.c
drivers/net/wireless/ipw2x00/ipw2100.c
+1
-4
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/ipw2x00/ipw2200.c
+0
-2
drivers/net/wireless/ipw2x00/libipw.h
drivers/net/wireless/ipw2x00/libipw.h
+0
-1
drivers/net/wireless/ipw2x00/libipw_module.c
drivers/net/wireless/ipw2x00/libipw_module.c
+5
-9
drivers/net/wireless/rt2x00/rt2x00dev.c
drivers/net/wireless/rt2x00/rt2x00dev.c
+2
-2
drivers/net/wireless/rt2x00/rt2x00link.c
drivers/net/wireless/rt2x00/rt2x00link.c
+7
-4
drivers/net/wireless/rt2x00/rt2x00usb.c
drivers/net/wireless/rt2x00/rt2x00usb.c
+8
-1
drivers/net/wireless/rtl818x/rtl8187_leds.c
drivers/net/wireless/rtl818x/rtl8187_leds.c
+2
-2
未找到文件。
drivers/net/wireless/ipw2x00/ipw2100.c
浏览文件 @
bb7b2284
...
...
@@ -6325,10 +6325,8 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
fail:
if
(
dev
)
{
if
(
registered
)
{
unregister_ieee80211
(
priv
->
ieee
);
if
(
registered
)
unregister_netdev
(
dev
);
}
ipw2100_hw_stop_adapter
(
priv
);
...
...
@@ -6385,7 +6383,6 @@ static void __devexit ipw2100_pci_remove_one(struct pci_dev *pci_dev)
/* Unregister the device first - this results in close()
* being called if the device is open. If we free storage
* first, then close() will crash. */
unregister_ieee80211
(
priv
->
ieee
);
unregister_netdev
(
dev
);
/* ipw2100_down will ensure that there is no more pending work
...
...
drivers/net/wireless/ipw2x00/ipw2200.c
浏览文件 @
bb7b2284
...
...
@@ -11821,7 +11821,6 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev,
if
(
err
)
{
IPW_ERROR
(
"Failed to register promiscuous network "
"device (error %d).
\n
"
,
err
);
unregister_ieee80211
(
priv
->
ieee
);
unregister_netdev
(
priv
->
net_dev
);
goto
out_remove_sysfs
;
}
...
...
@@ -11872,7 +11871,6 @@ static void __devexit ipw_pci_remove(struct pci_dev *pdev)
mutex_unlock
(
&
priv
->
mutex
);
unregister_ieee80211
(
priv
->
ieee
);
unregister_netdev
(
priv
->
net_dev
);
if
(
priv
->
rxq
)
{
...
...
drivers/net/wireless/ipw2x00/libipw.h
浏览文件 @
bb7b2284
...
...
@@ -1020,7 +1020,6 @@ static inline int libipw_is_cck_rate(u8 rate)
/* ieee80211.c */
extern
void
free_ieee80211
(
struct
net_device
*
dev
,
int
monitor
);
extern
struct
net_device
*
alloc_ieee80211
(
int
sizeof_priv
,
int
monitor
);
extern
void
unregister_ieee80211
(
struct
libipw_device
*
ieee
);
extern
int
libipw_change_mtu
(
struct
net_device
*
dev
,
int
new_mtu
);
extern
void
libipw_networks_age
(
struct
libipw_device
*
ieee
,
...
...
drivers/net/wireless/ipw2x00/libipw_module.c
浏览文件 @
bb7b2284
...
...
@@ -235,19 +235,16 @@ void free_ieee80211(struct net_device *dev, int monitor)
libipw_networks_free
(
ieee
);
/* free cfg80211 resources */
if
(
!
monitor
)
if
(
!
monitor
)
{
wiphy_unregister
(
ieee
->
wdev
.
wiphy
);
kfree
(
ieee
->
a_band
.
channels
);
kfree
(
ieee
->
bg_band
.
channels
);
wiphy_free
(
ieee
->
wdev
.
wiphy
);
}
free_netdev
(
dev
);
}
void
unregister_ieee80211
(
struct
libipw_device
*
ieee
)
{
wiphy_unregister
(
ieee
->
wdev
.
wiphy
);
kfree
(
ieee
->
a_band
.
channels
);
kfree
(
ieee
->
bg_band
.
channels
);
}
#ifdef CONFIG_LIBIPW_DEBUG
static
int
debug
=
0
;
...
...
@@ -333,4 +330,3 @@ module_init(libipw_init);
EXPORT_SYMBOL
(
alloc_ieee80211
);
EXPORT_SYMBOL
(
free_ieee80211
);
EXPORT_SYMBOL
(
unregister_ieee80211
);
drivers/net/wireless/rt2x00/rt2x00dev.c
浏览文件 @
bb7b2284
...
...
@@ -815,6 +815,8 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
mutex_init
(
&
rt2x00dev
->
csr_mutex
);
set_bit
(
DEVICE_STATE_PRESENT
,
&
rt2x00dev
->
flags
);
/*
* Make room for rt2x00_intf inside the per-interface
* structure ieee80211_vif.
...
...
@@ -871,8 +873,6 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
rt2x00leds_register
(
rt2x00dev
);
rt2x00debug_register
(
rt2x00dev
);
set_bit
(
DEVICE_STATE_PRESENT
,
&
rt2x00dev
->
flags
);
return
0
;
exit:
...
...
drivers/net/wireless/rt2x00/rt2x00link.c
浏览文件 @
bb7b2284
...
...
@@ -362,8 +362,9 @@ void rt2x00link_start_tuner(struct rt2x00_dev *rt2x00dev)
rt2x00link_reset_tuner
(
rt2x00dev
,
false
);
ieee80211_queue_delayed_work
(
rt2x00dev
->
hw
,
&
link
->
work
,
LINK_TUNE_INTERVAL
);
if
(
test_bit
(
DEVICE_STATE_PRESENT
,
&
rt2x00dev
->
flags
))
ieee80211_queue_delayed_work
(
rt2x00dev
->
hw
,
&
link
->
work
,
LINK_TUNE_INTERVAL
);
}
void
rt2x00link_stop_tuner
(
struct
rt2x00_dev
*
rt2x00dev
)
...
...
@@ -469,8 +470,10 @@ static void rt2x00link_tuner(struct work_struct *work)
* Increase tuner counter, and reschedule the next link tuner run.
*/
link
->
count
++
;
ieee80211_queue_delayed_work
(
rt2x00dev
->
hw
,
&
link
->
work
,
LINK_TUNE_INTERVAL
);
if
(
test_bit
(
DEVICE_STATE_PRESENT
,
&
rt2x00dev
->
flags
))
ieee80211_queue_delayed_work
(
rt2x00dev
->
hw
,
&
link
->
work
,
LINK_TUNE_INTERVAL
);
}
void
rt2x00link_register
(
struct
rt2x00_dev
*
rt2x00dev
)
...
...
drivers/net/wireless/rt2x00/rt2x00usb.c
浏览文件 @
bb7b2284
...
...
@@ -47,6 +47,8 @@ int rt2x00usb_vendor_request(struct rt2x00_dev *rt2x00dev,
(
requesttype
==
USB_VENDOR_REQUEST_IN
)
?
usb_rcvctrlpipe
(
usb_dev
,
0
)
:
usb_sndctrlpipe
(
usb_dev
,
0
);
if
(
!
test_bit
(
DEVICE_STATE_PRESENT
,
&
rt2x00dev
->
flags
))
return
-
ENODEV
;
for
(
i
=
0
;
i
<
REGISTER_BUSY_COUNT
;
i
++
)
{
status
=
usb_control_msg
(
usb_dev
,
pipe
,
request
,
requesttype
,
...
...
@@ -60,8 +62,10 @@ int rt2x00usb_vendor_request(struct rt2x00_dev *rt2x00dev,
* -ENODEV: Device has disappeared, no point continuing.
* All other errors: Try again.
*/
else
if
(
status
==
-
ENODEV
)
else
if
(
status
==
-
ENODEV
)
{
clear_bit
(
DEVICE_STATE_PRESENT
,
&
rt2x00dev
->
flags
);
break
;
}
}
ERROR
(
rt2x00dev
,
...
...
@@ -161,6 +165,9 @@ int rt2x00usb_regbusy_read(struct rt2x00_dev *rt2x00dev,
{
unsigned
int
i
;
if
(
!
test_bit
(
DEVICE_STATE_PRESENT
,
&
rt2x00dev
->
flags
))
return
-
ENODEV
;
for
(
i
=
0
;
i
<
REGISTER_BUSY_COUNT
;
i
++
)
{
rt2x00usb_register_read_lock
(
rt2x00dev
,
offset
,
reg
);
if
(
!
rt2x00_get_field32
(
*
reg
,
field
))
...
...
drivers/net/wireless/rtl818x/rtl8187_leds.c
浏览文件 @
bb7b2284
...
...
@@ -210,10 +210,10 @@ void rtl8187_leds_exit(struct ieee80211_hw *dev)
/* turn the LED off before exiting */
ieee80211_queue_delayed_work
(
dev
,
&
priv
->
led_off
,
0
);
cancel_delayed_work_sync
(
&
priv
->
led_off
);
cancel_delayed_work_sync
(
&
priv
->
led_on
);
rtl8187_unregister_led
(
&
priv
->
led_rx
);
rtl8187_unregister_led
(
&
priv
->
led_tx
);
cancel_delayed_work_sync
(
&
priv
->
led_off
);
cancel_delayed_work_sync
(
&
priv
->
led_on
);
}
#endif
/* def CONFIG_RTL8187_LED */
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录