Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Linux-御风守护者
linux
提交
0c9a3aaa
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,发现更多精彩内容 >>
提交
0c9a3aaa
编写于
2月 24, 2009
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
上级
fef7cc08
046ee5d2
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
44 addition
and
11 deletion
+44
-11
drivers/net/wireless/ath9k/main.c
drivers/net/wireless/ath9k/main.c
+17
-7
drivers/net/wireless/orinoco/orinoco.c
drivers/net/wireless/orinoco/orinoco.c
+15
-4
drivers/net/wireless/rtl818x/rtl8187_dev.c
drivers/net/wireless/rtl818x/rtl8187_dev.c
+12
-0
未找到文件。
drivers/net/wireless/ath9k/main.c
浏览文件 @
0c9a3aaa
...
...
@@ -1538,6 +1538,7 @@ static int ath_init(u16 devid, struct ath_softc *sc)
bad:
if
(
ah
)
ath9k_hw_detach
(
ah
);
ath9k_exit_debug
(
sc
);
return
error
;
}
...
...
@@ -1545,7 +1546,7 @@ static int ath_init(u16 devid, struct ath_softc *sc)
static
int
ath_attach
(
u16
devid
,
struct
ath_softc
*
sc
)
{
struct
ieee80211_hw
*
hw
=
sc
->
hw
;
int
error
=
0
;
int
error
=
0
,
i
;
DPRINTF
(
sc
,
ATH_DBG_CONFIG
,
"Attach ATH hw
\n
"
);
...
...
@@ -1589,11 +1590,11 @@ static int ath_attach(u16 devid, struct ath_softc *sc)
/* initialize tx/rx engine */
error
=
ath_tx_init
(
sc
,
ATH_TXBUF
);
if
(
error
!=
0
)
goto
de
tach
;
goto
error_at
tach
;
error
=
ath_rx_init
(
sc
,
ATH_RXBUF
);
if
(
error
!=
0
)
goto
de
tach
;
goto
error_at
tach
;
#if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
/* Initialze h/w Rfkill */
...
...
@@ -1601,8 +1602,9 @@ static int ath_attach(u16 devid, struct ath_softc *sc)
INIT_DELAYED_WORK
(
&
sc
->
rf_kill
.
rfkill_poll
,
ath_rfkill_poll
);
/* Initialize s/w rfkill */
if
(
ath_init_sw_rfkill
(
sc
))
goto
detach
;
error
=
ath_init_sw_rfkill
(
sc
);
if
(
error
)
goto
error_attach
;
#endif
error
=
ieee80211_register_hw
(
hw
);
...
...
@@ -1611,8 +1613,16 @@ static int ath_attach(u16 devid, struct ath_softc *sc)
ath_init_leds
(
sc
);
return
0
;
detach:
ath_detach
(
sc
);
error_attach:
/* cleanup tx queues */
for
(
i
=
0
;
i
<
ATH9K_NUM_TX_QUEUES
;
i
++
)
if
(
ATH_TXQ_SETUP
(
sc
,
i
))
ath_tx_cleanupq
(
sc
,
&
sc
->
tx
.
txq
[
i
]);
ath9k_hw_detach
(
sc
->
sc_ah
);
ath9k_exit_debug
(
sc
);
return
error
;
}
...
...
drivers/net/wireless/orinoco/orinoco.c
浏览文件 @
0c9a3aaa
...
...
@@ -3157,8 +3157,20 @@ static int orinoco_pm_notifier(struct notifier_block *notifier,
return
NOTIFY_DONE
;
}
static
void
orinoco_register_pm_notifier
(
struct
orinoco_private
*
priv
)
{
priv
->
pm_notifier
.
notifier_call
=
orinoco_pm_notifier
;
register_pm_notifier
(
&
priv
->
pm_notifier
);
}
static
void
orinoco_unregister_pm_notifier
(
struct
orinoco_private
*
priv
)
{
unregister_pm_notifier
(
&
priv
->
pm_notifier
);
}
#else
/* !PM_SLEEP || HERMES_CACHE_FW_ON_INIT */
#define orinoco_pm_notifier NULL
#define orinoco_register_pm_notifier(priv) do { } while(0)
#define orinoco_unregister_pm_notifier(priv) do { } while(0)
#endif
/********************************************************************/
...
...
@@ -3648,8 +3660,7 @@ struct net_device
priv
->
cached_fw
=
NULL
;
/* Register PM notifiers */
priv
->
pm_notifier
.
notifier_call
=
orinoco_pm_notifier
;
register_pm_notifier
(
&
priv
->
pm_notifier
);
orinoco_register_pm_notifier
(
priv
);
return
dev
;
}
...
...
@@ -3673,7 +3684,7 @@ void free_orinocodev(struct net_device *dev)
kfree
(
rx_data
);
}
unregister_pm_notifier
(
&
priv
->
pm_notifier
);
orinoco_unregister_pm_notifier
(
priv
);
orinoco_uncache_fw
(
priv
);
priv
->
wpa_ie_len
=
0
;
...
...
drivers/net/wireless/rtl818x/rtl8187_dev.c
浏览文件 @
0c9a3aaa
...
...
@@ -48,6 +48,10 @@ static struct usb_device_id rtl8187_table[] __devinitdata = {
{
USB_DEVICE
(
0x0bda
,
0x8189
),
.
driver_info
=
DEVICE_RTL8187B
},
{
USB_DEVICE
(
0x0bda
,
0x8197
),
.
driver_info
=
DEVICE_RTL8187B
},
{
USB_DEVICE
(
0x0bda
,
0x8198
),
.
driver_info
=
DEVICE_RTL8187B
},
/* Surecom */
{
USB_DEVICE
(
0x0769
,
0x11F2
),
.
driver_info
=
DEVICE_RTL8187
},
/* Logitech */
{
USB_DEVICE
(
0x0789
,
0x010C
),
.
driver_info
=
DEVICE_RTL8187
},
/* Netgear */
{
USB_DEVICE
(
0x0846
,
0x6100
),
.
driver_info
=
DEVICE_RTL8187
},
{
USB_DEVICE
(
0x0846
,
0x6a00
),
.
driver_info
=
DEVICE_RTL8187
},
...
...
@@ -57,8 +61,16 @@ static struct usb_device_id rtl8187_table[] __devinitdata = {
/* Sitecom */
{
USB_DEVICE
(
0x0df6
,
0x000d
),
.
driver_info
=
DEVICE_RTL8187
},
{
USB_DEVICE
(
0x0df6
,
0x0028
),
.
driver_info
=
DEVICE_RTL8187B
},
/* Sphairon Access Systems GmbH */
{
USB_DEVICE
(
0x114B
,
0x0150
),
.
driver_info
=
DEVICE_RTL8187
},
/* Dick Smith Electronics */
{
USB_DEVICE
(
0x1371
,
0x9401
),
.
driver_info
=
DEVICE_RTL8187
},
/* Abocom */
{
USB_DEVICE
(
0x13d1
,
0xabe6
),
.
driver_info
=
DEVICE_RTL8187
},
/* Qcom */
{
USB_DEVICE
(
0x18E8
,
0x6232
),
.
driver_info
=
DEVICE_RTL8187
},
/* AirLive */
{
USB_DEVICE
(
0x1b75
,
0x8187
),
.
driver_info
=
DEVICE_RTL8187
},
{}
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录