Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
4f4aeb7f
L
linux
项目概览
xiphi1978
/
linux
通知
2
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,发现更多精彩内容 >>
提交
4f4aeb7f
编写于
6月 03, 2010
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
上级
a1868dc2
51a0d38d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
18 deletion
+18
-18
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath5k/base.c
+3
-14
net/mac80211/agg-tx.c
net/mac80211/agg-tx.c
+4
-2
net/mac80211/rx.c
net/mac80211/rx.c
+11
-2
未找到文件。
drivers/net/wireless/ath/ath5k/base.c
浏览文件 @
4f4aeb7f
...
...
@@ -222,7 +222,6 @@ static int ath5k_tx(struct ieee80211_hw *hw, struct sk_buff *skb);
static
int
ath5k_tx_queue
(
struct
ieee80211_hw
*
hw
,
struct
sk_buff
*
skb
,
struct
ath5k_txq
*
txq
);
static
int
ath5k_reset
(
struct
ath5k_softc
*
sc
,
struct
ieee80211_channel
*
chan
);
static
int
ath5k_reset_wake
(
struct
ath5k_softc
*
sc
);
static
int
ath5k_start
(
struct
ieee80211_hw
*
hw
);
static
void
ath5k_stop
(
struct
ieee80211_hw
*
hw
);
static
int
ath5k_add_interface
(
struct
ieee80211_hw
*
hw
,
...
...
@@ -2770,7 +2769,7 @@ ath5k_tasklet_reset(unsigned long data)
{
struct
ath5k_softc
*
sc
=
(
void
*
)
data
;
ath5k_reset
_wake
(
sc
);
ath5k_reset
(
sc
,
sc
->
curchan
);
}
/*
...
...
@@ -2941,23 +2940,13 @@ ath5k_reset(struct ath5k_softc *sc, struct ieee80211_channel *chan)
ath5k_beacon_config
(
sc
);
/* intrs are enabled by ath5k_beacon_config */
ieee80211_wake_queues
(
sc
->
hw
);
return
0
;
err:
return
ret
;
}
static
int
ath5k_reset_wake
(
struct
ath5k_softc
*
sc
)
{
int
ret
;
ret
=
ath5k_reset
(
sc
,
sc
->
curchan
);
if
(
!
ret
)
ieee80211_wake_queues
(
sc
->
hw
);
return
ret
;
}
static
int
ath5k_start
(
struct
ieee80211_hw
*
hw
)
{
return
ath5k_init
(
hw
->
priv
);
...
...
net/mac80211/agg-tx.c
浏览文件 @
4f4aeb7f
...
...
@@ -332,14 +332,16 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid)
IEEE80211_QUEUE_STOP_REASON_AGGREGATION
);
spin_unlock
(
&
local
->
ampdu_lock
);
spin_unlock_bh
(
&
sta
->
lock
);
/*
send an addBA request
*/
/*
prepare tid data
*/
sta
->
ampdu_mlme
.
dialog_token_allocator
++
;
sta
->
ampdu_mlme
.
tid_tx
[
tid
]
->
dialog_token
=
sta
->
ampdu_mlme
.
dialog_token_allocator
;
sta
->
ampdu_mlme
.
tid_tx
[
tid
]
->
ssn
=
start_seq_num
;
spin_unlock_bh
(
&
sta
->
lock
);
/* send AddBA request */
ieee80211_send_addba_request
(
sdata
,
pubsta
->
addr
,
tid
,
sta
->
ampdu_mlme
.
tid_tx
[
tid
]
->
dialog_token
,
sta
->
ampdu_mlme
.
tid_tx
[
tid
]
->
ssn
,
...
...
net/mac80211/rx.c
浏览文件 @
4f4aeb7f
...
...
@@ -1818,17 +1818,26 @@ ieee80211_rx_h_ctrl(struct ieee80211_rx_data *rx, struct sk_buff_head *frames)
return
RX_CONTINUE
;
if
(
ieee80211_is_back_req
(
bar
->
frame_control
))
{
struct
{
__le16
control
,
start_seq_num
;
}
__packed
bar_data
;
if
(
!
rx
->
sta
)
return
RX_DROP_MONITOR
;
if
(
skb_copy_bits
(
skb
,
offsetof
(
struct
ieee80211_bar
,
control
),
&
bar_data
,
sizeof
(
bar_data
)))
return
RX_DROP_MONITOR
;
spin_lock
(
&
rx
->
sta
->
lock
);
tid
=
le16_to_cpu
(
bar
->
control
)
>>
12
;
tid
=
le16_to_cpu
(
bar
_data
.
control
)
>>
12
;
if
(
!
rx
->
sta
->
ampdu_mlme
.
tid_active_rx
[
tid
])
{
spin_unlock
(
&
rx
->
sta
->
lock
);
return
RX_DROP_MONITOR
;
}
tid_agg_rx
=
rx
->
sta
->
ampdu_mlme
.
tid_rx
[
tid
];
start_seq_num
=
le16_to_cpu
(
bar
->
start_seq_num
)
>>
4
;
start_seq_num
=
le16_to_cpu
(
bar
_data
.
start_seq_num
)
>>
4
;
/* reset session timer */
if
(
tid_agg_rx
->
timeout
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录