Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
5ca6f7c8
cloud-kernel
项目概览
openanolis
/
cloud-kernel
大约 1 年 前同步成功
通知
158
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
5ca6f7c8
编写于
8月 16, 2010
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
上级
daa3766e
6ccf15a1
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
48 addition
and
16 deletion
+48
-16
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath5k/base.c
+21
-0
drivers/net/wireless/ath/ath9k/eeprom.h
drivers/net/wireless/ath/ath9k/eeprom.h
+1
-0
drivers/net/wireless/ath/ath9k/eeprom_9287.c
drivers/net/wireless/ath/ath9k/eeprom_9287.c
+6
-1
drivers/net/wireless/ath/ath9k/hif_usb.c
drivers/net/wireless/ath/ath9k/hif_usb.c
+2
-6
drivers/net/wireless/ath/ath9k/htc_drv_init.c
drivers/net/wireless/ath/ath9k/htc_drv_init.c
+1
-0
drivers/net/wireless/ath/ath9k/htc_drv_main.c
drivers/net/wireless/ath/ath9k/htc_drv_main.c
+2
-1
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
+10
-5
drivers/net/wireless/ath/ath9k/reg.h
drivers/net/wireless/ath/ath9k/reg.h
+1
-0
drivers/net/wireless/ipw2x00/ipw2100.c
drivers/net/wireless/ipw2x00/ipw2100.c
+3
-2
drivers/net/wireless/wl12xx/wl1251_cmd.c
drivers/net/wireless/wl12xx/wl1251_cmd.c
+1
-1
未找到文件。
drivers/net/wireless/ath/ath5k/base.c
浏览文件 @
5ca6f7c8
...
...
@@ -48,6 +48,7 @@
#include <linux/netdevice.h>
#include <linux/cache.h>
#include <linux/pci.h>
#include <linux/pci-aspm.h>
#include <linux/ethtool.h>
#include <linux/uaccess.h>
#include <linux/slab.h>
...
...
@@ -476,6 +477,26 @@ ath5k_pci_probe(struct pci_dev *pdev,
int
ret
;
u8
csz
;
/*
* L0s needs to be disabled on all ath5k cards.
*
* For distributions shipping with CONFIG_PCIEASPM (this will be enabled
* by default in the future in 2.6.36) this will also mean both L1 and
* L0s will be disabled when a pre 1.1 PCIe device is detected. We do
* know L1 works correctly even for all ath5k pre 1.1 PCIe devices
* though but cannot currently undue the effect of a blacklist, for
* details you can read pcie_aspm_sanity_check() and see how it adjusts
* the device link capability.
*
* It may be possible in the future to implement some PCI API to allow
* drivers to override blacklists for pre 1.1 PCIe but for now it is
* best to accept that both L0s and L1 will be disabled completely for
* distributions shipping with CONFIG_PCIEASPM rather than having this
* issue present. Motivation for adding this new API will be to help
* with power consumption for some of these devices.
*/
pci_disable_link_state
(
pdev
,
PCIE_LINK_STATE_L0S
);
ret
=
pci_enable_device
(
pdev
);
if
(
ret
)
{
dev_err
(
&
pdev
->
dev
,
"can't enable device
\n
"
);
...
...
drivers/net/wireless/ath/ath9k/eeprom.h
浏览文件 @
5ca6f7c8
...
...
@@ -191,6 +191,7 @@
#define AR9287_EEP_NO_BACK_VER AR9287_EEP_MINOR_VER_1
#define AR9287_EEP_START_LOC 128
#define AR9287_HTC_EEP_START_LOC 256
#define AR9287_NUM_2G_CAL_PIERS 3
#define AR9287_NUM_2G_CCK_TARGET_POWERS 3
#define AR9287_NUM_2G_20_TARGET_POWERS 3
...
...
drivers/net/wireless/ath/ath9k/eeprom_9287.c
浏览文件 @
5ca6f7c8
...
...
@@ -34,9 +34,14 @@ static bool ath9k_hw_ar9287_fill_eeprom(struct ath_hw *ah)
struct
ar9287_eeprom
*
eep
=
&
ah
->
eeprom
.
map9287
;
struct
ath_common
*
common
=
ath9k_hw_common
(
ah
);
u16
*
eep_data
;
int
addr
,
eep_start_loc
=
AR9287_EEP_START_LOC
;
int
addr
,
eep_start_loc
;
eep_data
=
(
u16
*
)
eep
;
if
(
ah
->
hw_version
.
devid
==
0x7015
)
eep_start_loc
=
AR9287_HTC_EEP_START_LOC
;
else
eep_start_loc
=
AR9287_EEP_START_LOC
;
if
(
!
ath9k_hw_use_flash
(
ah
))
{
ath_print
(
common
,
ATH_DBG_EEPROM
,
"Reading from EEPROM, not flash
\n
"
);
...
...
drivers/net/wireless/ath/ath9k/hif_usb.c
浏览文件 @
5ca6f7c8
...
...
@@ -799,7 +799,7 @@ static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev)
}
kfree
(
buf
);
if
(
hif_dev
->
device_id
==
0x7010
)
if
(
(
hif_dev
->
device_id
==
0x7010
)
||
(
hif_dev
->
device_id
==
0x7015
)
)
firm_offset
=
AR7010_FIRMWARE_TEXT
;
else
firm_offset
=
AR9271_FIRMWARE_TEXT
;
...
...
@@ -901,6 +901,7 @@ static int ath9k_hif_usb_probe(struct usb_interface *interface,
switch
(
hif_dev
->
device_id
)
{
case
0x7010
:
case
0x7015
:
case
0x9018
:
if
(
le16_to_cpu
(
udev
->
descriptor
.
bcdDevice
)
==
0x0202
)
hif_dev
->
fw_name
=
FIRMWARE_AR7010_1_1
;
...
...
@@ -912,11 +913,6 @@ static int ath9k_hif_usb_probe(struct usb_interface *interface,
break
;
}
if
(
!
hif_dev
->
fw_name
)
{
dev_err
(
&
udev
->
dev
,
"Can't determine firmware !
\n
"
);
goto
err_htc_hw_alloc
;
}
ret
=
ath9k_hif_usb_dev_init
(
hif_dev
);
if
(
ret
)
{
ret
=
-
EINVAL
;
...
...
drivers/net/wireless/ath/ath9k/htc_drv_init.c
浏览文件 @
5ca6f7c8
...
...
@@ -245,6 +245,7 @@ static int ath9k_init_htc_services(struct ath9k_htc_priv *priv, u16 devid)
switch
(
devid
)
{
case
0x7010
:
case
0x7015
:
case
0x9018
:
priv
->
htc
->
credits
=
45
;
break
;
...
...
drivers/net/wireless/ath/ath9k/htc_drv_main.c
浏览文件 @
5ca6f7c8
...
...
@@ -366,7 +366,8 @@ static void ath9k_htc_setup_rate(struct ath9k_htc_priv *priv,
caps
=
WLAN_RC_HT_FLAG
;
if
(
sta
->
ht_cap
.
mcs
.
rx_mask
[
1
])
caps
|=
WLAN_RC_DS_FLAG
;
if
(
sta
->
ht_cap
.
cap
&
IEEE80211_HT_CAP_SUP_WIDTH_20_40
)
if
((
sta
->
ht_cap
.
cap
&
IEEE80211_HT_CAP_SUP_WIDTH_20_40
)
&&
(
conf_is_ht40
(
&
priv
->
hw
->
conf
)))
caps
|=
WLAN_RC_40_FLAG
;
if
(
conf_is_ht40
(
&
priv
->
hw
->
conf
)
&&
(
sta
->
ht_cap
.
cap
&
IEEE80211_HT_CAP_SGI_40
))
...
...
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
浏览文件 @
5ca6f7c8
...
...
@@ -78,18 +78,23 @@ int ath9k_htc_tx_start(struct ath9k_htc_priv *priv, struct sk_buff *skb)
struct
ieee80211_tx_info
*
tx_info
=
IEEE80211_SKB_CB
(
skb
);
struct
ieee80211_sta
*
sta
=
tx_info
->
control
.
sta
;
struct
ath9k_htc_sta
*
ista
;
struct
ath9k_htc_vif
*
avp
;
struct
ath9k_htc_tx_ctl
tx_ctl
;
enum
htc_endpoint_id
epid
;
u16
qnum
;
__le16
fc
;
u8
*
tx_fhdr
;
u8
sta_idx
;
u8
sta_idx
,
vif_idx
;
hdr
=
(
struct
ieee80211_hdr
*
)
skb
->
data
;
fc
=
hdr
->
frame_control
;
avp
=
(
struct
ath9k_htc_vif
*
)
tx_info
->
control
.
vif
->
drv_priv
;
if
(
tx_info
->
control
.
vif
&&
(
struct
ath9k_htc_vif
*
)
tx_info
->
control
.
vif
->
drv_priv
)
vif_idx
=
((
struct
ath9k_htc_vif
*
)
tx_info
->
control
.
vif
->
drv_priv
)
->
index
;
else
vif_idx
=
priv
->
nvifs
;
if
(
sta
)
{
ista
=
(
struct
ath9k_htc_sta
*
)
sta
->
drv_priv
;
sta_idx
=
ista
->
index
;
...
...
@@ -106,7 +111,7 @@ int ath9k_htc_tx_start(struct ath9k_htc_priv *priv, struct sk_buff *skb)
memset
(
&
tx_hdr
,
0
,
sizeof
(
struct
tx_frame_hdr
));
tx_hdr
.
node_idx
=
sta_idx
;
tx_hdr
.
vif_idx
=
avp
->
inde
x
;
tx_hdr
.
vif_idx
=
vif_id
x
;
if
(
tx_info
->
flags
&
IEEE80211_TX_CTL_AMPDU
)
{
tx_ctl
.
type
=
ATH9K_HTC_AMPDU
;
...
...
@@ -169,7 +174,7 @@ int ath9k_htc_tx_start(struct ath9k_htc_priv *priv, struct sk_buff *skb)
tx_ctl
.
type
=
ATH9K_HTC_NORMAL
;
mgmt_hdr
.
node_idx
=
sta_idx
;
mgmt_hdr
.
vif_idx
=
avp
->
inde
x
;
mgmt_hdr
.
vif_idx
=
vif_id
x
;
mgmt_hdr
.
tidno
=
0
;
mgmt_hdr
.
flags
=
0
;
...
...
drivers/net/wireless/ath/ath9k/reg.h
浏览文件 @
5ca6f7c8
...
...
@@ -899,6 +899,7 @@
#define AR_DEVID_7010(_ah) \
(((_ah)->hw_version.devid == 0x7010) || \
((_ah)->hw_version.devid == 0x7015) || \
((_ah)->hw_version.devid == 0x9018))
#define AR_RADIO_SREV_MAJOR 0xf0
...
...
drivers/net/wireless/ipw2x00/ipw2100.c
浏览文件 @
5ca6f7c8
...
...
@@ -6665,12 +6665,13 @@ static int __init ipw2100_init(void)
printk
(
KERN_INFO
DRV_NAME
": %s, %s
\n
"
,
DRV_DESCRIPTION
,
DRV_VERSION
);
printk
(
KERN_INFO
DRV_NAME
": %s
\n
"
,
DRV_COPYRIGHT
);
pm_qos_add_request
(
&
ipw2100_pm_qos_req
,
PM_QOS_CPU_DMA_LATENCY
,
PM_QOS_DEFAULT_VALUE
);
ret
=
pci_register_driver
(
&
ipw2100_pci_driver
);
if
(
ret
)
goto
out
;
pm_qos_add_request
(
&
ipw2100_pm_qos_req
,
PM_QOS_CPU_DMA_LATENCY
,
PM_QOS_DEFAULT_VALUE
);
#ifdef CONFIG_IPW2100_DEBUG
ipw2100_debug_level
=
debug
;
ret
=
driver_create_file
(
&
ipw2100_pci_driver
.
driver
,
...
...
drivers/net/wireless/wl12xx/wl1251_cmd.c
浏览文件 @
5ca6f7c8
...
...
@@ -484,7 +484,7 @@ int wl1251_cmd_trigger_scan_to(struct wl1251 *wl, u32 timeout)
cmd
->
timeout
=
timeout
;
ret
=
wl1251_cmd_send
(
wl
,
CMD_
SCAN
,
cmd
,
sizeof
(
*
cmd
));
ret
=
wl1251_cmd_send
(
wl
,
CMD_
TRIGGER_SCAN_TO
,
cmd
,
sizeof
(
*
cmd
));
if
(
ret
<
0
)
{
wl1251_error
(
"cmd trigger scan to failed: %d"
,
ret
);
goto
out
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录