Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
8701ff0a
K
Kernel
项目概览
openeuler
/
Kernel
1 年多 前同步成功
通知
8
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
8701ff0a
编写于
2月 29, 2012
作者:
J
John W. Linville
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
上级
f4fb4b21
00f157b4
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
45 addition
and
34 deletion
+45
-34
drivers/net/wireless/ath/ath9k/ar5008_phy.c
drivers/net/wireless/ath/ath9k/ar5008_phy.c
+1
-24
drivers/net/wireless/ath/ath9k/ar9002_hw.c
drivers/net/wireless/ath/ath9k/ar9002_hw.c
+19
-0
drivers/net/wireless/ath/ath9k/hw.h
drivers/net/wireless/ath/ath9k/hw.h
+0
-1
drivers/net/wireless/ath/carl9170/tx.c
drivers/net/wireless/ath/carl9170/tx.c
+6
-3
drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
+3
-3
drivers/net/wireless/iwlwifi/iwl-agn-sta.c
drivers/net/wireless/iwlwifi/iwl-agn-sta.c
+9
-1
drivers/net/wireless/mwifiex/cfg80211.c
drivers/net/wireless/mwifiex/cfg80211.c
+1
-0
drivers/net/wireless/rt2x00/rt2x00dev.c
drivers/net/wireless/rt2x00/rt2x00dev.c
+2
-1
net/mac80211/iface.c
net/mac80211/iface.c
+3
-0
net/mac80211/rate.c
net/mac80211/rate.c
+1
-1
未找到文件。
drivers/net/wireless/ath/ath9k/ar5008_phy.c
浏览文件 @
8701ff0a
...
...
@@ -489,8 +489,6 @@ static int ar5008_hw_rf_alloc_ext_banks(struct ath_hw *ah)
ATH_ALLOC_BANK
(
ah
->
analogBank6Data
,
ah
->
iniBank6
.
ia_rows
);
ATH_ALLOC_BANK
(
ah
->
analogBank6TPCData
,
ah
->
iniBank6TPC
.
ia_rows
);
ATH_ALLOC_BANK
(
ah
->
analogBank7Data
,
ah
->
iniBank7
.
ia_rows
);
ATH_ALLOC_BANK
(
ah
->
addac5416_21
,
ah
->
iniAddac
.
ia_rows
*
ah
->
iniAddac
.
ia_columns
);
ATH_ALLOC_BANK
(
ah
->
bank6Temp
,
ah
->
iniBank6
.
ia_rows
);
return
0
;
...
...
@@ -519,7 +517,6 @@ static void ar5008_hw_rf_free_ext_banks(struct ath_hw *ah)
ATH_FREE_BANK
(
ah
->
analogBank6Data
);
ATH_FREE_BANK
(
ah
->
analogBank6TPCData
);
ATH_FREE_BANK
(
ah
->
analogBank7Data
);
ATH_FREE_BANK
(
ah
->
addac5416_21
);
ATH_FREE_BANK
(
ah
->
bank6Temp
);
#undef ATH_FREE_BANK
...
...
@@ -805,27 +802,7 @@ static int ar5008_hw_process_ini(struct ath_hw *ah,
if
(
ah
->
eep_ops
->
set_addac
)
ah
->
eep_ops
->
set_addac
(
ah
,
chan
);
if
(
AR_SREV_5416_22_OR_LATER
(
ah
))
{
REG_WRITE_ARRAY
(
&
ah
->
iniAddac
,
1
,
regWrites
);
}
else
{
struct
ar5416IniArray
temp
;
u32
addacSize
=
sizeof
(
u32
)
*
ah
->
iniAddac
.
ia_rows
*
ah
->
iniAddac
.
ia_columns
;
/* For AR5416 2.0/2.1 */
memcpy
(
ah
->
addac5416_21
,
ah
->
iniAddac
.
ia_array
,
addacSize
);
/* override CLKDRV value at [row, column] = [31, 1] */
(
ah
->
addac5416_21
)[
31
*
ah
->
iniAddac
.
ia_columns
+
1
]
=
0
;
temp
.
ia_array
=
ah
->
addac5416_21
;
temp
.
ia_columns
=
ah
->
iniAddac
.
ia_columns
;
temp
.
ia_rows
=
ah
->
iniAddac
.
ia_rows
;
REG_WRITE_ARRAY
(
&
temp
,
1
,
regWrites
);
}
REG_WRITE_ARRAY
(
&
ah
->
iniAddac
,
1
,
regWrites
);
REG_WRITE
(
ah
,
AR_PHY_ADC_SERIAL_CTL
,
AR_PHY_SEL_INTERNAL_ADDAC
);
ENABLE_REGWRITE_BUFFER
(
ah
);
...
...
drivers/net/wireless/ath/ath9k/ar9002_hw.c
浏览文件 @
8701ff0a
...
...
@@ -141,6 +141,25 @@ static void ar9002_hw_init_mode_regs(struct ath_hw *ah)
INIT_INI_ARRAY
(
&
ah
->
iniBank6TPC
,
ar5416Bank6TPC_9100
,
ARRAY_SIZE
(
ar5416Bank6TPC_9100
),
3
);
}
/* iniAddac needs to be modified for these chips */
if
(
AR_SREV_9160
(
ah
)
||
!
AR_SREV_5416_22_OR_LATER
(
ah
))
{
struct
ar5416IniArray
*
addac
=
&
ah
->
iniAddac
;
u32
size
=
sizeof
(
u32
)
*
addac
->
ia_rows
*
addac
->
ia_columns
;
u32
*
data
;
data
=
kmalloc
(
size
,
GFP_KERNEL
);
if
(
!
data
)
return
;
memcpy
(
data
,
addac
->
ia_array
,
size
);
addac
->
ia_array
=
data
;
if
(
!
AR_SREV_5416_22_OR_LATER
(
ah
))
{
/* override CLKDRV value */
INI_RA
(
addac
,
31
,
1
)
=
0
;
}
}
}
/* Support for Japan ch.14 (2484) spread */
...
...
drivers/net/wireless/ath/ath9k/hw.h
浏览文件 @
8701ff0a
...
...
@@ -781,7 +781,6 @@ struct ath_hw {
u32
*
analogBank6Data
;
u32
*
analogBank6TPCData
;
u32
*
analogBank7Data
;
u32
*
addac5416_21
;
u32
*
bank6Temp
;
u8
txpower_limit
;
...
...
drivers/net/wireless/ath/carl9170/tx.c
浏览文件 @
8701ff0a
...
...
@@ -1236,6 +1236,7 @@ static bool carl9170_tx_ps_drop(struct ar9170 *ar, struct sk_buff *skb)
{
struct
ieee80211_sta
*
sta
;
struct
carl9170_sta_info
*
sta_info
;
struct
ieee80211_tx_info
*
tx_info
;
rcu_read_lock
();
sta
=
__carl9170_get_tx_sta
(
ar
,
skb
);
...
...
@@ -1243,16 +1244,18 @@ static bool carl9170_tx_ps_drop(struct ar9170 *ar, struct sk_buff *skb)
goto
out_rcu
;
sta_info
=
(
void
*
)
sta
->
drv_priv
;
if
(
unlikely
(
sta_info
->
sleeping
))
{
struct
ieee80211_tx_info
*
tx_info
;
tx_info
=
IEEE80211_SKB_CB
(
skb
);
if
(
unlikely
(
sta_info
->
sleeping
)
&&
!
(
tx_info
->
flags
&
(
IEEE80211_TX_CTL_POLL_RESPONSE
|
IEEE80211_TX_CTL_CLEAR_PS_FILT
)))
{
rcu_read_unlock
();
tx_info
=
IEEE80211_SKB_CB
(
skb
);
if
(
tx_info
->
flags
&
IEEE80211_TX_CTL_AMPDU
)
atomic_dec
(
&
ar
->
tx_ampdu_upload
);
tx_info
->
flags
|=
IEEE80211_TX_STAT_TX_FILTERED
;
carl9170_release_dev_space
(
ar
,
skb
);
carl9170_tx_status
(
ar
,
skb
,
false
);
return
true
;
}
...
...
drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
浏览文件 @
8701ff0a
...
...
@@ -1070,9 +1070,9 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,
IEEE80211_TX_STAT_AMPDU_NO_BACK
;
skb_pull
(
p
,
D11_PHY_HDR_LEN
);
skb_pull
(
p
,
D11_TXH_LEN
);
wiphy_err
(
wiphy
,
"%s: BA Timeout, seq %d, in_"
"transit %d
\n
"
,
"AMPDU status"
,
seq
,
ini
->
tx_in_transit
);
BCMMSG
(
wiphy
,
"BA Timeout, seq %d, in_transit %d
\n
"
,
seq
,
ini
->
tx_in_transit
);
ieee80211_tx_status_irqsafe
(
wlc
->
pub
->
ieee_hw
,
p
);
}
...
...
drivers/net/wireless/iwlwifi/iwl-agn-sta.c
浏览文件 @
8701ff0a
...
...
@@ -1190,6 +1190,7 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv,
unsigned
long
flags
;
struct
iwl_addsta_cmd
sta_cmd
;
u8
sta_id
=
iwlagn_key_sta_id
(
priv
,
ctx
->
vif
,
sta
);
__le16
key_flags
;
/* if station isn't there, neither is the key */
if
(
sta_id
==
IWL_INVALID_STATION
)
...
...
@@ -1215,7 +1216,14 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv,
IWL_ERR
(
priv
,
"offset %d not used in uCode key table.
\n
"
,
keyconf
->
hw_key_idx
);
sta_cmd
.
key
.
key_flags
=
STA_KEY_FLG_NO_ENC
|
STA_KEY_FLG_INVALID
;
key_flags
=
cpu_to_le16
(
keyconf
->
keyidx
<<
STA_KEY_FLG_KEYID_POS
);
key_flags
|=
STA_KEY_FLG_MAP_KEY_MSK
|
STA_KEY_FLG_NO_ENC
|
STA_KEY_FLG_INVALID
;
if
(
!
(
keyconf
->
flags
&
IEEE80211_KEY_FLAG_PAIRWISE
))
key_flags
|=
STA_KEY_MULTICAST_MSK
;
sta_cmd
.
key
.
key_flags
=
key_flags
;
sta_cmd
.
key
.
key_offset
=
WEP_INVALID_OFFSET
;
sta_cmd
.
sta
.
modify_mask
=
STA_MODIFY_KEY_MASK
;
sta_cmd
.
mode
=
STA_CONTROL_MODIFY_MSK
;
...
...
drivers/net/wireless/mwifiex/cfg80211.c
浏览文件 @
8701ff0a
...
...
@@ -872,6 +872,7 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,
priv
->
sec_info
.
wpa_enabled
=
false
;
priv
->
sec_info
.
wpa2_enabled
=
false
;
priv
->
wep_key_curr_index
=
0
;
priv
->
sec_info
.
encryption_mode
=
0
;
ret
=
mwifiex_set_encode
(
priv
,
NULL
,
0
,
0
,
1
);
if
(
mode
==
NL80211_IFTYPE_ADHOC
)
{
...
...
drivers/net/wireless/rt2x00/rt2x00dev.c
浏览文件 @
8701ff0a
...
...
@@ -1236,7 +1236,8 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
cancel_work_sync
(
&
rt2x00dev
->
rxdone_work
);
cancel_work_sync
(
&
rt2x00dev
->
txdone_work
);
}
destroy_workqueue
(
rt2x00dev
->
workqueue
);
if
(
rt2x00dev
->
workqueue
)
destroy_workqueue
(
rt2x00dev
->
workqueue
);
/*
* Free the tx status fifo.
...
...
net/mac80211/iface.c
浏览文件 @
8701ff0a
...
...
@@ -1344,6 +1344,9 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local)
hw_roc
=
true
;
list_for_each_entry
(
sdata
,
&
local
->
interfaces
,
list
)
{
if
(
sdata
->
vif
.
type
==
NL80211_IFTYPE_MONITOR
||
sdata
->
vif
.
type
==
NL80211_IFTYPE_AP_VLAN
)
continue
;
if
(
sdata
->
old_idle
==
sdata
->
vif
.
bss_conf
.
idle
)
continue
;
if
(
!
ieee80211_sdata_running
(
sdata
))
...
...
net/mac80211/rate.c
浏览文件 @
8701ff0a
...
...
@@ -447,7 +447,7 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
for
(
i
=
0
;
i
<
IEEE80211_TX_MAX_RATES
;
i
++
)
{
info
->
control
.
rates
[
i
].
idx
=
-
1
;
info
->
control
.
rates
[
i
].
flags
=
0
;
info
->
control
.
rates
[
i
].
count
=
1
;
info
->
control
.
rates
[
i
].
count
=
0
;
}
if
(
sdata
->
local
->
hw
.
flags
&
IEEE80211_HW_HAS_RATE_CONTROL
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录