Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
6e1344e8
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,发现更多精彩内容 >>
提交
6e1344e8
编写于
5月 04, 2012
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'for-davem' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
上级
8af3994e
3c3052ea
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
20 addition
and
10 deletion
+20
-10
drivers/net/wireless/ath/ath9k/ar9003_phy.c
drivers/net/wireless/ath/ath9k/ar9003_phy.c
+2
-2
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+1
-0
drivers/net/wireless/iwlwifi/iwl-agn-rx.c
drivers/net/wireless/iwlwifi/iwl-agn-rx.c
+14
-7
drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
+2
-1
drivers/net/wireless/iwlwifi/iwl-trans.h
drivers/net/wireless/iwlwifi/iwl-trans.h
+1
-0
未找到文件。
drivers/net/wireless/ath/ath9k/ar9003_phy.c
浏览文件 @
6e1344e8
...
...
@@ -373,7 +373,7 @@ static void ar9003_hw_spur_ofdm_work(struct ath_hw *ah,
else
spur_subchannel_sd
=
0
;
spur_freq_sd
=
(
freq_offset
<<
9
)
/
11
;
spur_freq_sd
=
(
(
freq_offset
+
10
)
<<
9
)
/
11
;
}
else
{
if
(
REG_READ_FIELD
(
ah
,
AR_PHY_GEN_CTRL
,
...
...
@@ -382,7 +382,7 @@ static void ar9003_hw_spur_ofdm_work(struct ath_hw *ah,
else
spur_subchannel_sd
=
1
;
spur_freq_sd
=
(
freq_offset
<<
9
)
/
11
;
spur_freq_sd
=
(
(
freq_offset
-
10
)
<<
9
)
/
11
;
}
...
...
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
浏览文件 @
6e1344e8
...
...
@@ -2637,6 +2637,7 @@ static int brcmf_sdbrcm_dpc_thread(void *data)
/* after stopping the bus, exit thread */
brcmf_sdbrcm_bus_stop
(
bus
->
sdiodev
->
dev
);
bus
->
dpc_tsk
=
NULL
;
spin_lock_irqsave
(
&
bus
->
dpc_tl_lock
,
flags
);
break
;
}
...
...
drivers/net/wireless/iwlwifi/iwl-agn-rx.c
浏览文件 @
6e1344e8
...
...
@@ -773,8 +773,7 @@ static void iwlagn_pass_packet_to_mac80211(struct iwl_priv *priv,
struct
sk_buff
*
skb
;
__le16
fc
=
hdr
->
frame_control
;
struct
iwl_rxon_context
*
ctx
;
struct
page
*
p
;
int
offset
;
unsigned
int
hdrlen
,
fraglen
;
/* We only process data packets if the interface is open */
if
(
unlikely
(
!
priv
->
is_open
))
{
...
...
@@ -788,16 +787,24 @@ static void iwlagn_pass_packet_to_mac80211(struct iwl_priv *priv,
iwlagn_set_decrypted_flag
(
priv
,
hdr
,
ampdu_status
,
stats
))
return
;
skb
=
dev_alloc_skb
(
128
);
/* Dont use dev_alloc_skb(), we'll have enough headroom once
* ieee80211_hdr pulled.
*/
skb
=
alloc_skb
(
128
,
GFP_ATOMIC
);
if
(
!
skb
)
{
IWL_ERR
(
priv
,
"
dev_
alloc_skb failed
\n
"
);
IWL_ERR
(
priv
,
"alloc_skb failed
\n
"
);
return
;
}
hdrlen
=
min_t
(
unsigned
int
,
len
,
skb_tailroom
(
skb
));
memcpy
(
skb_put
(
skb
,
hdrlen
),
hdr
,
hdrlen
);
fraglen
=
len
-
hdrlen
;
offset
=
(
void
*
)
hdr
-
rxb_addr
(
rxb
);
p
=
rxb_steal_page
(
rxb
);
skb_add_rx_frag
(
skb
,
0
,
p
,
offset
,
len
,
len
);
if
(
fraglen
)
{
int
offset
=
(
void
*
)
hdr
+
hdrlen
-
rxb_addr
(
rxb
);
skb_add_rx_frag
(
skb
,
0
,
rxb_steal_page
(
rxb
),
offset
,
fraglen
,
rxb
->
truesize
);
}
iwl_update_stats
(
priv
,
false
,
fc
,
len
);
/*
...
...
drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
浏览文件 @
6e1344e8
...
...
@@ -374,8 +374,9 @@ static void iwl_rx_handle_rxbuf(struct iwl_trans *trans,
if
(
WARN_ON
(
!
rxb
))
return
;
rxcb
.
truesize
=
PAGE_SIZE
<<
hw_params
(
trans
).
rx_page_order
;
dma_unmap_page
(
trans
->
dev
,
rxb
->
page_dma
,
PAGE_SIZE
<<
hw_params
(
trans
).
rx_page_order
,
rxcb
.
truesize
,
DMA_FROM_DEVICE
);
rxcb
.
_page
=
rxb
->
page
;
...
...
drivers/net/wireless/iwlwifi/iwl-trans.h
浏览文件 @
6e1344e8
...
...
@@ -260,6 +260,7 @@ static inline void iwl_free_resp(struct iwl_host_cmd *cmd)
struct
iwl_rx_cmd_buffer
{
struct
page
*
_page
;
unsigned
int
truesize
;
};
static
inline
void
*
rxb_addr
(
struct
iwl_rx_cmd_buffer
*
r
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录