Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
raspberrypi-kernel
提交
54f5ffbf
R
raspberrypi-kernel
项目概览
openeuler
/
raspberrypi-kernel
通知
13
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
raspberrypi-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
54f5ffbf
编写于
12年前
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
上级
1d24fb36
de312db3
无相关合并请求
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
17 addition
and
13 deletion
+17
-13
MAINTAINERS
MAINTAINERS
+4
-8
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/ath9k/main.c
+2
-2
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/ipw2x00/ipw2200.c
+2
-2
drivers/net/wireless/orinoco/main.c
drivers/net/wireless/orinoco/main.c
+8
-0
net/mac80211/scan.c
net/mac80211/scan.c
+1
-1
未找到文件。
MAINTAINERS
浏览文件 @
54f5ffbf
...
...
@@ -3553,17 +3553,13 @@ L: linux-pm@vger.kernel.org
S: Supported
F: arch/x86/platform/mrst/pmu.*
INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
INTEL PRO/WIRELESS 2100, 2200BG, 2915ABG NETWORK CONNECTION SUPPORT
M: Stanislav Yakovlev <stas.yakovlev@gmail.com>
L: linux-wireless@vger.kernel.org
S:
Orphan
S:
Maintained
F: Documentation/networking/README.ipw2100
F: drivers/net/wireless/ipw2x00/ipw2100.*
INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT
L: linux-wireless@vger.kernel.org
S: Orphan
F: Documentation/networking/README.ipw2200
F: drivers/net/wireless/ipw2x00/
ipw2200.*
F: drivers/net/wireless/ipw2x00/
INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)
M: Joseph Cihula <joseph.cihula@intel.com>
...
...
This diff is collapsed.
Click to expand it.
drivers/net/wireless/ath/ath9k/main.c
浏览文件 @
54f5ffbf
...
...
@@ -640,7 +640,7 @@ static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta,
an
->
sta
=
sta
;
an
->
vif
=
vif
;
if
(
s
ta
->
ht_cap
.
ht_supported
)
{
if
(
s
c
->
sc_ah
->
caps
.
hw_caps
&
ATH9K_HW_CAP_HT
)
{
ath_tx_node_init
(
sc
,
an
);
an
->
maxampdu
=
1
<<
(
IEEE80211_HT_MAX_AMPDU_FACTOR
+
sta
->
ht_cap
.
ampdu_factor
);
...
...
@@ -659,7 +659,7 @@ static void ath_node_detach(struct ath_softc *sc, struct ieee80211_sta *sta)
an
->
sta
=
NULL
;
#endif
if
(
s
ta
->
ht_cap
.
ht_supported
)
if
(
s
c
->
sc_ah
->
caps
.
hw_caps
&
ATH9K_HW_CAP_HT
)
ath_tx_node_cleanup
(
sc
,
an
);
}
...
...
This diff is collapsed.
Click to expand it.
drivers/net/wireless/ipw2x00/ipw2200.c
浏览文件 @
54f5ffbf
...
...
@@ -11507,9 +11507,9 @@ static int ipw_wdev_init(struct net_device *dev)
rc
=
-
ENOMEM
;
goto
out
;
}
/* translate geo->
bg
to a_band.channels */
/* translate geo->
a
to a_band.channels */
for
(
i
=
0
;
i
<
geo
->
a_channels
;
i
++
)
{
a_band
->
channels
[
i
].
band
=
IEEE80211_BAND_
2
GHZ
;
a_band
->
channels
[
i
].
band
=
IEEE80211_BAND_
5
GHZ
;
a_band
->
channels
[
i
].
center_freq
=
geo
->
a
[
i
].
freq
;
a_band
->
channels
[
i
].
hw_value
=
geo
->
a
[
i
].
channel
;
a_band
->
channels
[
i
].
max_power
=
geo
->
a
[
i
].
max_power
;
...
...
This diff is collapsed.
Click to expand it.
drivers/net/wireless/orinoco/main.c
浏览文件 @
54f5ffbf
...
...
@@ -1336,6 +1336,10 @@ static void qbuf_scan(struct orinoco_private *priv, void *buf,
unsigned
long
flags
;
sd
=
kmalloc
(
sizeof
(
*
sd
),
GFP_ATOMIC
);
if
(
!
sd
)
{
printk
(
KERN_ERR
"%s: failed to alloc memory
\n
"
,
__func__
);
return
;
}
sd
->
buf
=
buf
;
sd
->
len
=
len
;
sd
->
type
=
type
;
...
...
@@ -1353,6 +1357,10 @@ static void qabort_scan(struct orinoco_private *priv)
unsigned
long
flags
;
sd
=
kmalloc
(
sizeof
(
*
sd
),
GFP_ATOMIC
);
if
(
!
sd
)
{
printk
(
KERN_ERR
"%s: failed to alloc memory
\n
"
,
__func__
);
return
;
}
sd
->
len
=
-
1
;
/* Abort */
spin_lock_irqsave
(
&
priv
->
scan_lock
,
flags
);
...
...
This diff is collapsed.
Click to expand it.
net/mac80211/scan.c
浏览文件 @
54f5ffbf
...
...
@@ -370,7 +370,7 @@ static int ieee80211_start_sw_scan(struct ieee80211_local *local)
*/
drv_sw_scan_start
(
local
);
local
->
leave_oper_channel_time
=
0
;
local
->
leave_oper_channel_time
=
jiffies
;
local
->
next_scan_state
=
SCAN_DECISION
;
local
->
scan_channel_idx
=
0
;
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
反馈
建议
客服
返回
顶部