Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
64db880e
cloud-kernel
项目概览
openanolis
/
cloud-kernel
11 个月 前同步成功
通知
150
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,发现更多精彩内容 >>
提交
64db880e
编写于
2月 08, 2012
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'for-davem' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
上级
5ca3b72c
7a73b08b
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
45 addition
and
16 deletion
+45
-16
drivers/bcma/main.c
drivers/bcma/main.c
+1
-3
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/hw.c
+5
-2
drivers/net/wireless/ath/ath9k/init.c
drivers/net/wireless/ath/ath9k/init.c
+5
-4
drivers/net/wireless/ath/ath9k/rc.c
drivers/net/wireless/ath/ath9k/rc.c
+1
-1
drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/ath/ath9k/recv.c
+8
-0
drivers/net/wireless/mwifiex/init.c
drivers/net/wireless/mwifiex/init.c
+2
-1
drivers/net/wireless/mwifiex/main.c
drivers/net/wireless/mwifiex/main.c
+8
-4
drivers/net/wireless/mwifiex/sta_ioctl.c
drivers/net/wireless/mwifiex/sta_ioctl.c
+7
-1
drivers/net/wireless/zd1211rw/zd_mac.c
drivers/net/wireless/zd1211rw/zd_mac.c
+8
-0
未找到文件。
drivers/bcma/main.c
浏览文件 @
64db880e
...
...
@@ -169,10 +169,8 @@ int bcma_bus_register(struct bcma_bus *bus)
err
=
bcma_sprom_get
(
bus
);
if
(
err
==
-
ENOENT
)
{
pr_err
(
"No SPROM available
\n
"
);
}
else
if
(
err
)
{
}
else
if
(
err
)
pr_err
(
"Failed to get SPROM: %d
\n
"
,
err
);
return
-
ENOENT
;
}
/* Register found cores */
bcma_register_cores
(
bus
);
...
...
drivers/net/wireless/ath/ath9k/hw.c
浏览文件 @
64db880e
...
...
@@ -1037,13 +1037,16 @@ void ath9k_hw_init_global_settings(struct ath_hw *ah)
/*
* Workaround for early ACK timeouts, add an offset to match the
* initval's 64us ack timeout value.
* initval's 64us ack timeout value.
Use 48us for the CTS timeout.
* This was initially only meant to work around an issue with delayed
* BA frames in some implementations, but it has been found to fix ACK
* timeout issues in other cases as well.
*/
if
(
conf
->
channel
&&
conf
->
channel
->
band
==
IEEE80211_BAND_2GHZ
)
if
(
conf
->
channel
&&
conf
->
channel
->
band
==
IEEE80211_BAND_2GHZ
)
{
acktimeout
+=
64
-
sifstime
-
ah
->
slottime
;
ctstimeout
+=
48
-
sifstime
-
ah
->
slottime
;
}
ath9k_hw_set_sifs_time
(
ah
,
sifstime
);
ath9k_hw_setslottime
(
ah
,
slottime
);
...
...
drivers/net/wireless/ath/ath9k/init.c
浏览文件 @
64db880e
...
...
@@ -822,6 +822,11 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc,
ARRAY_SIZE
(
ath9k_tpt_blink
));
#endif
INIT_WORK
(
&
sc
->
hw_reset_work
,
ath_reset_work
);
INIT_WORK
(
&
sc
->
hw_check_work
,
ath_hw_check
);
INIT_WORK
(
&
sc
->
paprd_work
,
ath_paprd_calibrate
);
INIT_DELAYED_WORK
(
&
sc
->
hw_pll_work
,
ath_hw_pll_work
);
/* Register with mac80211 */
error
=
ieee80211_register_hw
(
hw
);
if
(
error
)
...
...
@@ -840,10 +845,6 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc,
goto
error_world
;
}
INIT_WORK
(
&
sc
->
hw_reset_work
,
ath_reset_work
);
INIT_WORK
(
&
sc
->
hw_check_work
,
ath_hw_check
);
INIT_WORK
(
&
sc
->
paprd_work
,
ath_paprd_calibrate
);
INIT_DELAYED_WORK
(
&
sc
->
hw_pll_work
,
ath_hw_pll_work
);
sc
->
last_rssi
=
ATH_RSSI_DUMMY_MARKER
;
ath_init_leds
(
sc
);
...
...
drivers/net/wireless/ath/ath9k/rc.c
浏览文件 @
64db880e
...
...
@@ -694,7 +694,7 @@ static u8 ath_rc_get_highest_rix(struct ath_softc *sc,
return
rate
;
/* This should not happen */
WARN_ON
(
1
);
WARN_ON
_ONCE
(
1
);
rate
=
ath_rc_priv
->
valid_rate_index
[
0
];
...
...
drivers/net/wireless/ath/ath9k/recv.c
浏览文件 @
64db880e
...
...
@@ -822,6 +822,14 @@ static bool ath9k_rx_accept(struct ath_common *common,
(
ATH9K_RXERR_DECRYPT
|
ATH9K_RXERR_CRC
|
ATH9K_RXERR_MIC
|
ATH9K_RXERR_KEYMISS
));
/*
* Key miss events are only relevant for pairwise keys where the
* descriptor does contain a valid key index. This has been observed
* mostly with CCMP encryption.
*/
if
(
rx_stats
->
rs_keyix
==
ATH9K_RXKEYIX_INVALID
)
rx_stats
->
rs_status
&=
~
ATH9K_RXERR_KEYMISS
;
if
(
!
rx_stats
->
rs_datalen
)
return
false
;
/*
...
...
drivers/net/wireless/mwifiex/init.c
浏览文件 @
64db880e
...
...
@@ -382,7 +382,8 @@ mwifiex_free_adapter(struct mwifiex_adapter *adapter)
adapter
->
if_ops
.
cleanup_if
(
adapter
);
dev_kfree_skb_any
(
adapter
->
sleep_cfm
);
if
(
adapter
->
sleep_cfm
)
dev_kfree_skb_any
(
adapter
->
sleep_cfm
);
}
/*
...
...
drivers/net/wireless/mwifiex/main.c
浏览文件 @
64db880e
...
...
@@ -822,7 +822,9 @@ int mwifiex_remove_card(struct mwifiex_adapter *adapter, struct semaphore *sem)
continue
;
rtnl_lock
();
mwifiex_del_virtual_intf
(
priv
->
wdev
->
wiphy
,
priv
->
netdev
);
if
(
priv
->
wdev
&&
priv
->
netdev
)
mwifiex_del_virtual_intf
(
priv
->
wdev
->
wiphy
,
priv
->
netdev
);
rtnl_unlock
();
}
...
...
@@ -830,9 +832,11 @@ int mwifiex_remove_card(struct mwifiex_adapter *adapter, struct semaphore *sem)
if
(
!
priv
)
goto
exit_remove
;
wiphy_unregister
(
priv
->
wdev
->
wiphy
);
wiphy_free
(
priv
->
wdev
->
wiphy
);
kfree
(
priv
->
wdev
);
if
(
priv
->
wdev
)
{
wiphy_unregister
(
priv
->
wdev
->
wiphy
);
wiphy_free
(
priv
->
wdev
->
wiphy
);
kfree
(
priv
->
wdev
);
}
mwifiex_terminate_workqueue
(
adapter
);
...
...
drivers/net/wireless/mwifiex/sta_ioctl.c
浏览文件 @
64db880e
...
...
@@ -54,7 +54,7 @@ int mwifiex_copy_mcast_addr(struct mwifiex_multicast_list *mlist,
int
mwifiex_wait_queue_complete
(
struct
mwifiex_adapter
*
adapter
)
{
bool
cancel_flag
=
false
;
int
status
=
adapter
->
cmd_wait_q
.
status
;
int
status
;
struct
cmd_ctrl_node
*
cmd_queued
;
if
(
!
adapter
->
cmd_queued
)
...
...
@@ -79,6 +79,8 @@ int mwifiex_wait_queue_complete(struct mwifiex_adapter *adapter)
mwifiex_cancel_pending_ioctl
(
adapter
);
dev_dbg
(
adapter
->
dev
,
"cmd cancel
\n
"
);
}
status
=
adapter
->
cmd_wait_q
.
status
;
adapter
->
cmd_wait_q
.
status
=
0
;
return
status
;
...
...
@@ -240,6 +242,8 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,
if
(
!
netif_queue_stopped
(
priv
->
netdev
))
mwifiex_stop_net_dev_queue
(
priv
->
netdev
,
adapter
);
if
(
netif_carrier_ok
(
priv
->
netdev
))
netif_carrier_off
(
priv
->
netdev
);
/* Clear any past association response stored for
* application retrieval */
...
...
@@ -271,6 +275,8 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,
if
(
!
netif_queue_stopped
(
priv
->
netdev
))
mwifiex_stop_net_dev_queue
(
priv
->
netdev
,
adapter
);
if
(
netif_carrier_ok
(
priv
->
netdev
))
netif_carrier_off
(
priv
->
netdev
);
if
(
!
ret
)
{
dev_dbg
(
adapter
->
dev
,
"info: network found in scan"
...
...
drivers/net/wireless/zd1211rw/zd_mac.c
浏览文件 @
64db880e
...
...
@@ -866,6 +866,14 @@ static int fill_ctrlset(struct zd_mac *mac,
ZD_ASSERT
(
frag_len
<=
0xffff
);
/*
* Firmware computes the duration itself (for all frames except PSPoll)
* and needs the field set to 0 at input, otherwise firmware messes up
* duration_id and sets bits 14 and 15 on.
*/
if
(
!
ieee80211_is_pspoll
(
hdr
->
frame_control
))
hdr
->
duration_id
=
0
;
txrate
=
ieee80211_get_tx_rate
(
mac
->
hw
,
info
);
cs
->
modulation
=
txrate
->
hw_value
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录