Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
819ae6a3
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,发现更多精彩内容 >>
提交
819ae6a3
编写于
8月 09, 2009
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
上级
0d502d82
dd1f57ec
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
22 addition
and
15 deletion
+22
-15
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/ipw2x00/ipw2200.c
+1
-1
drivers/net/wireless/libertas/hostcmd.h
drivers/net/wireless/libertas/hostcmd.h
+2
-2
drivers/net/wireless/mwl8k.c
drivers/net/wireless/mwl8k.c
+19
-12
未找到文件。
drivers/net/wireless/ipw2x00/ipw2200.c
浏览文件 @
819ae6a3
...
...
@@ -6226,7 +6226,7 @@ static void ipw_add_scan_channels(struct ipw_priv *priv,
};
u8
channel
;
while
(
channel_index
<
IPW_SCAN_CHANNELS
)
{
while
(
channel_index
<
IPW_SCAN_CHANNELS
-
1
)
{
channel
=
priv
->
speed_scan
[
priv
->
speed_scan_pos
];
if
(
channel
==
0
)
{
...
...
drivers/net/wireless/libertas/hostcmd.h
浏览文件 @
819ae6a3
...
...
@@ -56,8 +56,8 @@ struct rxpd {
u8
bss_type
;
/* BSS number */
u8
bss_num
;
}
bss
;
}
u
;
}
__attribute__
((
packed
))
bss
;
}
__attribute__
((
packed
))
u
;
/* SNR */
u8
snr
;
...
...
drivers/net/wireless/mwl8k.c
浏览文件 @
819ae6a3
...
...
@@ -261,7 +261,7 @@ struct mwl8k_vif {
*/
};
#define MWL8K_VIF(_vif) (
struct mwl8k_vif *)(
&((_vif)->drv_priv))
#define MWL8K_VIF(_vif) (
(struct mwl8k_vif *)
&((_vif)->drv_priv))
static
const
struct
ieee80211_channel
mwl8k_channels
[]
=
{
{
.
center_freq
=
2412
,
.
hw_value
=
1
,
},
...
...
@@ -1012,6 +1012,8 @@ static int rxq_process(struct ieee80211_hw *hw, int index, int limit)
rmb
();
skb
=
rxq
->
rx_skb
[
rxq
->
rx_head
];
if
(
skb
==
NULL
)
break
;
rxq
->
rx_skb
[
rxq
->
rx_head
]
=
NULL
;
rxq
->
rx_head
=
(
rxq
->
rx_head
+
1
)
%
MWL8K_RX_DESCS
;
...
...
@@ -1591,6 +1593,9 @@ static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt *cmd)
timeout
=
wait_for_completion_timeout
(
&
cmd_wait
,
msecs_to_jiffies
(
MWL8K_CMD_TIMEOUT_MS
));
pci_unmap_single
(
priv
->
pdev
,
dma_addr
,
dma_size
,
PCI_DMA_BIDIRECTIONAL
);
result
=
&
cmd
->
result
;
if
(
!
timeout
)
{
spin_lock_irq
(
&
priv
->
fw_lock
);
...
...
@@ -1610,8 +1615,6 @@ static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt *cmd)
*
result
);
}
pci_unmap_single
(
priv
->
pdev
,
dma_addr
,
dma_size
,
PCI_DMA_BIDIRECTIONAL
);
return
rc
;
}
...
...
@@ -1654,18 +1657,18 @@ static int mwl8k_cmd_get_hw_spec(struct ieee80211_hw *hw)
memset
(
cmd
->
perm_addr
,
0xff
,
sizeof
(
cmd
->
perm_addr
));
cmd
->
ps_cookie
=
cpu_to_le32
(
priv
->
cookie_dma
);
cmd
->
rx_queue_ptr
=
cpu_to_le32
(
priv
->
rxq
[
0
].
rx_desc_dma
);
cmd
->
num_tx_queues
=
MWL8K_TX_QUEUES
;
cmd
->
num_tx_queues
=
cpu_to_le32
(
MWL8K_TX_QUEUES
)
;
for
(
i
=
0
;
i
<
MWL8K_TX_QUEUES
;
i
++
)
cmd
->
tx_queue_ptrs
[
i
]
=
cpu_to_le32
(
priv
->
txq
[
i
].
tx_desc_dma
);
cmd
->
num_tx_desc_per_queue
=
MWL8K_TX_DESCS
;
cmd
->
total_rx_desc
=
MWL8K_RX_DESCS
;
cmd
->
num_tx_desc_per_queue
=
cpu_to_le32
(
MWL8K_TX_DESCS
)
;
cmd
->
total_rx_desc
=
cpu_to_le32
(
MWL8K_RX_DESCS
)
;
rc
=
mwl8k_post_cmd
(
hw
,
&
cmd
->
header
);
if
(
!
rc
)
{
SET_IEEE80211_PERM_ADDR
(
hw
,
cmd
->
perm_addr
);
priv
->
num_mcaddrs
=
le16_to_cpu
(
cmd
->
num_mcaddrs
);
priv
->
fw_rev
=
cmd
->
fw_rev
;
priv
->
fw_rev
=
le32_to_cpu
(
cmd
->
fw_rev
)
;
priv
->
hw_rev
=
cmd
->
hw_rev
;
priv
->
region_code
=
le16_to_cpu
(
cmd
->
region_code
);
}
...
...
@@ -3216,15 +3219,19 @@ static int mwl8k_configure_filter_wt(struct work_struct *wt)
struct
dev_addr_list
*
mclist
=
worker
->
mclist
;
struct
mwl8k_priv
*
priv
=
hw
->
priv
;
struct
mwl8k_vif
*
mv_vif
;
int
rc
=
0
;
if
(
changed_flags
&
FIF_BCN_PRBRESP_PROMISC
)
{
if
(
*
total_flags
&
FIF_BCN_PRBRESP_PROMISC
)
rc
=
mwl8k_cmd_set_pre_scan
(
hw
);
else
{
mv_vif
=
MWL8K_VIF
(
priv
->
vif
);
rc
=
mwl8k_cmd_set_post_scan
(
hw
,
mv_vif
->
bssid
);
u8
*
bssid
;
bssid
=
"
\x00\x00\x00\x00\x00\x00
"
;
if
(
priv
->
vif
!=
NULL
)
bssid
=
MWL8K_VIF
(
priv
->
vif
)
->
bssid
;
rc
=
mwl8k_cmd_set_post_scan
(
hw
,
bssid
);
}
}
...
...
@@ -3726,6 +3733,8 @@ static void __devexit mwl8k_remove(struct pci_dev *pdev)
ieee80211_stop_queues
(
hw
);
ieee80211_unregister_hw
(
hw
);
/* Remove tx reclaim tasklet */
tasklet_kill
(
&
priv
->
tx_reclaim_task
);
...
...
@@ -3739,8 +3748,6 @@ static void __devexit mwl8k_remove(struct pci_dev *pdev)
for
(
i
=
0
;
i
<
MWL8K_TX_QUEUES
;
i
++
)
mwl8k_txq_reclaim
(
hw
,
i
,
1
);
ieee80211_unregister_hw
(
hw
);
for
(
i
=
0
;
i
<
MWL8K_TX_QUEUES
;
i
++
)
mwl8k_txq_deinit
(
hw
,
i
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录