Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FengXiao2002
Linux Imx
提交
d2daeabf
L
Linux Imx
项目概览
FengXiao2002
/
Linux Imx
通知
8
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
Linux Imx
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d2daeabf
编写于
7月 08, 2009
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
上级
c3b85423
1ce822fa
变更
19
显示空白变更内容
内联
并排
Showing
19 changed file
with
48 addition
and
17 deletion
+48
-17
Documentation/DocBook/mac80211.tmpl
Documentation/DocBook/mac80211.tmpl
+0
-2
drivers/net/wireless/ath/Kconfig
drivers/net/wireless/ath/Kconfig
+1
-0
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/ath/ath9k/xmit.c
+8
-1
drivers/net/wireless/b43/b43.h
drivers/net/wireless/b43/b43.h
+1
-0
drivers/net/wireless/b43/main.c
drivers/net/wireless/b43/main.c
+5
-2
drivers/net/wireless/b43/pcmcia.c
drivers/net/wireless/b43/pcmcia.c
+1
-0
drivers/net/wireless/b43legacy/b43legacy.h
drivers/net/wireless/b43legacy/b43legacy.h
+1
-0
drivers/net/wireless/b43legacy/main.c
drivers/net/wireless/b43legacy/main.c
+5
-2
drivers/net/wireless/iwmc3200wifi/Kconfig
drivers/net/wireless/iwmc3200wifi/Kconfig
+9
-0
drivers/net/wireless/mac80211_hwsim.c
drivers/net/wireless/mac80211_hwsim.c
+1
-0
drivers/net/wireless/p54/p54common.c
drivers/net/wireless/p54/p54common.c
+3
-2
drivers/net/wireless/zd1211rw/zd_usb.c
drivers/net/wireless/zd1211rw/zd_usb.c
+2
-1
drivers/platform/x86/hp-wmi.c
drivers/platform/x86/hp-wmi.c
+1
-1
drivers/ssb/pcmcia.c
drivers/ssb/pcmcia.c
+4
-2
include/linux/rfkill.h
include/linux/rfkill.h
+0
-1
net/mac80211/mesh_hwmp.c
net/mac80211/mesh_hwmp.c
+1
-1
net/mac80211/rc80211_minstrel.c
net/mac80211/rc80211_minstrel.c
+4
-1
net/wireless/nl80211.c
net/wireless/nl80211.c
+1
-0
net/wireless/scan.c
net/wireless/scan.c
+0
-1
未找到文件。
Documentation/DocBook/mac80211.tmpl
浏览文件 @
d2daeabf
...
@@ -184,8 +184,6 @@ usage should require reading the full document.
...
@@ -184,8 +184,6 @@ usage should require reading the full document.
!Finclude/net/mac80211.h ieee80211_ctstoself_get
!Finclude/net/mac80211.h ieee80211_ctstoself_get
!Finclude/net/mac80211.h ieee80211_ctstoself_duration
!Finclude/net/mac80211.h ieee80211_ctstoself_duration
!Finclude/net/mac80211.h ieee80211_generic_frame_duration
!Finclude/net/mac80211.h ieee80211_generic_frame_duration
!Finclude/net/mac80211.h ieee80211_get_hdrlen_from_skb
!Finclude/net/mac80211.h ieee80211_hdrlen
!Finclude/net/mac80211.h ieee80211_wake_queue
!Finclude/net/mac80211.h ieee80211_wake_queue
!Finclude/net/mac80211.h ieee80211_stop_queue
!Finclude/net/mac80211.h ieee80211_stop_queue
!Finclude/net/mac80211.h ieee80211_wake_queues
!Finclude/net/mac80211.h ieee80211_wake_queues
...
...
drivers/net/wireless/ath/Kconfig
浏览文件 @
d2daeabf
config ATH_COMMON
config ATH_COMMON
tristate "Atheros Wireless Cards"
tristate "Atheros Wireless Cards"
depends on WLAN_80211
depends on ATH5K || ATH9K || AR9170_USB
depends on ATH5K || ATH9K || AR9170_USB
source "drivers/net/wireless/ath/ath5k/Kconfig"
source "drivers/net/wireless/ath/ath5k/Kconfig"
...
...
drivers/net/wireless/ath/ath9k/xmit.c
浏览文件 @
d2daeabf
...
@@ -355,6 +355,13 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
...
@@ -355,6 +355,13 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
}
}
if
(
bf_next
==
NULL
)
{
if
(
bf_next
==
NULL
)
{
/*
* Make sure the last desc is reclaimed if it
* not a holding desc.
*/
if
(
!
bf_last
->
bf_stale
)
list_move_tail
(
&
bf
->
list
,
&
bf_head
);
else
INIT_LIST_HEAD
(
&
bf_head
);
INIT_LIST_HEAD
(
&
bf_head
);
}
else
{
}
else
{
ASSERT
(
!
list_empty
(
bf_q
));
ASSERT
(
!
list_empty
(
bf_q
));
...
...
drivers/net/wireless/b43/b43.h
浏览文件 @
d2daeabf
...
@@ -648,6 +648,7 @@ struct b43_wl {
...
@@ -648,6 +648,7 @@ struct b43_wl {
u8
nr_devs
;
u8
nr_devs
;
bool
radiotap_enabled
;
bool
radiotap_enabled
;
bool
radio_enabled
;
/* The beacon we are currently using (AP or IBSS mode).
/* The beacon we are currently using (AP or IBSS mode).
* This beacon stuff is protected by the irq_lock. */
* This beacon stuff is protected by the irq_lock. */
...
...
drivers/net/wireless/b43/main.c
浏览文件 @
d2daeabf
...
@@ -3497,8 +3497,8 @@ static int b43_op_config(struct ieee80211_hw *hw, u32 changed)
...
@@ -3497,8 +3497,8 @@ static int b43_op_config(struct ieee80211_hw *hw, u32 changed)
if
(
phy
->
ops
->
set_rx_antenna
)
if
(
phy
->
ops
->
set_rx_antenna
)
phy
->
ops
->
set_rx_antenna
(
dev
,
antenna
);
phy
->
ops
->
set_rx_antenna
(
dev
,
antenna
);
if
(
!!
conf
->
radio_enabled
!=
phy
->
radio_on
)
{
if
(
wl
->
radio_enabled
!=
phy
->
radio_on
)
{
if
(
conf
->
radio_enabled
)
{
if
(
wl
->
radio_enabled
)
{
b43_software_rfkill
(
dev
,
false
);
b43_software_rfkill
(
dev
,
false
);
b43info
(
dev
->
wl
,
"Radio turned on by software
\n
"
);
b43info
(
dev
->
wl
,
"Radio turned on by software
\n
"
);
if
(
!
dev
->
radio_hw_enable
)
{
if
(
!
dev
->
radio_hw_enable
)
{
...
@@ -4339,6 +4339,7 @@ static int b43_op_start(struct ieee80211_hw *hw)
...
@@ -4339,6 +4339,7 @@ static int b43_op_start(struct ieee80211_hw *hw)
wl
->
beacon0_uploaded
=
0
;
wl
->
beacon0_uploaded
=
0
;
wl
->
beacon1_uploaded
=
0
;
wl
->
beacon1_uploaded
=
0
;
wl
->
beacon_templates_virgin
=
1
;
wl
->
beacon_templates_virgin
=
1
;
wl
->
radio_enabled
=
1
;
mutex_lock
(
&
wl
->
mutex
);
mutex_lock
(
&
wl
->
mutex
);
...
@@ -4378,6 +4379,7 @@ static void b43_op_stop(struct ieee80211_hw *hw)
...
@@ -4378,6 +4379,7 @@ static void b43_op_stop(struct ieee80211_hw *hw)
if
(
b43_status
(
dev
)
>=
B43_STAT_STARTED
)
if
(
b43_status
(
dev
)
>=
B43_STAT_STARTED
)
b43_wireless_core_stop
(
dev
);
b43_wireless_core_stop
(
dev
);
b43_wireless_core_exit
(
dev
);
b43_wireless_core_exit
(
dev
);
wl
->
radio_enabled
=
0
;
mutex_unlock
(
&
wl
->
mutex
);
mutex_unlock
(
&
wl
->
mutex
);
cancel_work_sync
(
&
(
wl
->
txpower_adjust_work
));
cancel_work_sync
(
&
(
wl
->
txpower_adjust_work
));
...
@@ -4560,6 +4562,7 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)
...
@@ -4560,6 +4562,7 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)
B43_WARN_ON
(
1
);
B43_WARN_ON
(
1
);
dev
->
phy
.
gmode
=
have_2ghz_phy
;
dev
->
phy
.
gmode
=
have_2ghz_phy
;
dev
->
phy
.
radio_on
=
1
;
tmp
=
dev
->
phy
.
gmode
?
B43_TMSLOW_GMODE
:
0
;
tmp
=
dev
->
phy
.
gmode
?
B43_TMSLOW_GMODE
:
0
;
b43_wireless_core_reset
(
dev
,
tmp
);
b43_wireless_core_reset
(
dev
,
tmp
);
...
...
drivers/net/wireless/b43/pcmcia.c
浏览文件 @
d2daeabf
...
@@ -35,6 +35,7 @@
...
@@ -35,6 +35,7 @@
static
/*const */
struct
pcmcia_device_id
b43_pcmcia_tbl
[]
=
{
static
/*const */
struct
pcmcia_device_id
b43_pcmcia_tbl
[]
=
{
PCMCIA_DEVICE_MANF_CARD
(
0x2D0
,
0x448
),
PCMCIA_DEVICE_MANF_CARD
(
0x2D0
,
0x448
),
PCMCIA_DEVICE_MANF_CARD
(
0x2D0
,
0x476
),
PCMCIA_DEVICE_NULL
,
PCMCIA_DEVICE_NULL
,
};
};
...
...
drivers/net/wireless/b43legacy/b43legacy.h
浏览文件 @
d2daeabf
...
@@ -607,6 +607,7 @@ struct b43legacy_wl {
...
@@ -607,6 +607,7 @@ struct b43legacy_wl {
u8
nr_devs
;
u8
nr_devs
;
bool
radiotap_enabled
;
bool
radiotap_enabled
;
bool
radio_enabled
;
/* The beacon we are currently using (AP or IBSS mode).
/* The beacon we are currently using (AP or IBSS mode).
* This beacon stuff is protected by the irq_lock. */
* This beacon stuff is protected by the irq_lock. */
...
...
drivers/net/wireless/b43legacy/main.c
浏览文件 @
d2daeabf
...
@@ -2689,8 +2689,8 @@ static int b43legacy_op_dev_config(struct ieee80211_hw *hw,
...
@@ -2689,8 +2689,8 @@ static int b43legacy_op_dev_config(struct ieee80211_hw *hw,
/* Antennas for RX and management frame TX. */
/* Antennas for RX and management frame TX. */
b43legacy_mgmtframe_txantenna
(
dev
,
antenna_tx
);
b43legacy_mgmtframe_txantenna
(
dev
,
antenna_tx
);
if
(
!!
conf
->
radio_enabled
!=
phy
->
radio_on
)
{
if
(
wl
->
radio_enabled
!=
phy
->
radio_on
)
{
if
(
conf
->
radio_enabled
)
{
if
(
wl
->
radio_enabled
)
{
b43legacy_radio_turn_on
(
dev
);
b43legacy_radio_turn_on
(
dev
);
b43legacyinfo
(
dev
->
wl
,
"Radio turned on by software
\n
"
);
b43legacyinfo
(
dev
->
wl
,
"Radio turned on by software
\n
"
);
if
(
!
dev
->
radio_hw_enable
)
if
(
!
dev
->
radio_hw_enable
)
...
@@ -3441,6 +3441,7 @@ static int b43legacy_op_start(struct ieee80211_hw *hw)
...
@@ -3441,6 +3441,7 @@ static int b43legacy_op_start(struct ieee80211_hw *hw)
wl
->
beacon0_uploaded
=
0
;
wl
->
beacon0_uploaded
=
0
;
wl
->
beacon1_uploaded
=
0
;
wl
->
beacon1_uploaded
=
0
;
wl
->
beacon_templates_virgin
=
1
;
wl
->
beacon_templates_virgin
=
1
;
wl
->
radio_enabled
=
1
;
mutex_lock
(
&
wl
->
mutex
);
mutex_lock
(
&
wl
->
mutex
);
...
@@ -3479,6 +3480,7 @@ static void b43legacy_op_stop(struct ieee80211_hw *hw)
...
@@ -3479,6 +3480,7 @@ static void b43legacy_op_stop(struct ieee80211_hw *hw)
if
(
b43legacy_status
(
dev
)
>=
B43legacy_STAT_STARTED
)
if
(
b43legacy_status
(
dev
)
>=
B43legacy_STAT_STARTED
)
b43legacy_wireless_core_stop
(
dev
);
b43legacy_wireless_core_stop
(
dev
);
b43legacy_wireless_core_exit
(
dev
);
b43legacy_wireless_core_exit
(
dev
);
wl
->
radio_enabled
=
0
;
mutex_unlock
(
&
wl
->
mutex
);
mutex_unlock
(
&
wl
->
mutex
);
}
}
...
@@ -3620,6 +3622,7 @@ static int b43legacy_wireless_core_attach(struct b43legacy_wldev *dev)
...
@@ -3620,6 +3622,7 @@ static int b43legacy_wireless_core_attach(struct b43legacy_wldev *dev)
have_bphy
=
1
;
have_bphy
=
1
;
dev
->
phy
.
gmode
=
(
have_gphy
||
have_bphy
);
dev
->
phy
.
gmode
=
(
have_gphy
||
have_bphy
);
dev
->
phy
.
radio_on
=
1
;
tmp
=
dev
->
phy
.
gmode
?
B43legacy_TMSLOW_GMODE
:
0
;
tmp
=
dev
->
phy
.
gmode
?
B43legacy_TMSLOW_GMODE
:
0
;
b43legacy_wireless_core_reset
(
dev
,
tmp
);
b43legacy_wireless_core_reset
(
dev
,
tmp
);
...
...
drivers/net/wireless/iwmc3200wifi/Kconfig
浏览文件 @
d2daeabf
...
@@ -4,6 +4,15 @@ config IWM
...
@@ -4,6 +4,15 @@ config IWM
depends on CFG80211
depends on CFG80211
select WIRELESS_EXT
select WIRELESS_EXT
select FW_LOADER
select FW_LOADER
help
The Intel Wireless Multicomm 3200 hardware is a combo
card with GPS, Bluetooth, WiMax and 802.11 radios. It
runs over SDIO and is typically found on Moorestown
based platform. This driver takes care of the 802.11
part, which is a fullmac one.
If you choose to build it as a module, it'll be called
iwmc3200wifi.ko.
config IWM_DEBUG
config IWM_DEBUG
bool "Enable full debugging output in iwmc3200wifi"
bool "Enable full debugging output in iwmc3200wifi"
...
...
drivers/net/wireless/mac80211_hwsim.c
浏览文件 @
d2daeabf
...
@@ -418,6 +418,7 @@ static bool mac80211_hwsim_tx_frame(struct ieee80211_hw *hw,
...
@@ -418,6 +418,7 @@ static bool mac80211_hwsim_tx_frame(struct ieee80211_hw *hw,
continue
;
continue
;
if
(
!
data2
->
started
||
!
hwsim_ps_rx_ok
(
data2
,
skb
)
||
if
(
!
data2
->
started
||
!
hwsim_ps_rx_ok
(
data2
,
skb
)
||
!
data
->
channel
||
!
data2
->
channel
||
data
->
channel
->
center_freq
!=
data2
->
channel
->
center_freq
||
data
->
channel
->
center_freq
!=
data2
->
channel
->
center_freq
||
!
(
data
->
group
&
data2
->
group
))
!
(
data
->
group
&
data2
->
group
))
continue
;
continue
;
...
...
drivers/net/wireless/p54/p54common.c
浏览文件 @
d2daeabf
...
@@ -912,13 +912,14 @@ static void p54_rx_frame_sent(struct ieee80211_hw *dev, struct sk_buff *skb)
...
@@ -912,13 +912,14 @@ static void p54_rx_frame_sent(struct ieee80211_hw *dev, struct sk_buff *skb)
}
}
__skb_unlink
(
entry
,
&
priv
->
tx_queue
);
__skb_unlink
(
entry
,
&
priv
->
tx_queue
);
spin_unlock_irqrestore
(
&
priv
->
tx_queue
.
lock
,
flags
);
frame_len
=
entry
->
len
;
frame_len
=
entry
->
len
;
entry_hdr
=
(
struct
p54_hdr
*
)
entry
->
data
;
entry_hdr
=
(
struct
p54_hdr
*
)
entry
->
data
;
entry_data
=
(
struct
p54_tx_data
*
)
entry_hdr
->
data
;
entry_data
=
(
struct
p54_tx_data
*
)
entry_hdr
->
data
;
if
(
priv
->
tx_stats
[
entry_data
->
hw_queue
].
len
)
priv
->
tx_stats
[
entry_data
->
hw_queue
].
len
--
;
priv
->
tx_stats
[
entry_data
->
hw_queue
].
len
--
;
priv
->
stats
.
dot11ACKFailureCount
+=
payload
->
tries
-
1
;
priv
->
stats
.
dot11ACKFailureCount
+=
payload
->
tries
-
1
;
spin_unlock_irqrestore
(
&
priv
->
tx_queue
.
lock
,
flags
);
/*
/*
* Frames in P54_QUEUE_FWSCAN and P54_QUEUE_BEACON are
* Frames in P54_QUEUE_FWSCAN and P54_QUEUE_BEACON are
...
...
drivers/net/wireless/zd1211rw/zd_usb.c
浏览文件 @
d2daeabf
...
@@ -38,7 +38,6 @@ static struct usb_device_id usb_ids[] = {
...
@@ -38,7 +38,6 @@ static struct usb_device_id usb_ids[] = {
/* ZD1211 */
/* ZD1211 */
{
USB_DEVICE
(
0x0ace
,
0x1211
),
.
driver_info
=
DEVICE_ZD1211
},
{
USB_DEVICE
(
0x0ace
,
0x1211
),
.
driver_info
=
DEVICE_ZD1211
},
{
USB_DEVICE
(
0x0ace
,
0xa211
),
.
driver_info
=
DEVICE_ZD1211
},
{
USB_DEVICE
(
0x0ace
,
0xa211
),
.
driver_info
=
DEVICE_ZD1211
},
{
USB_DEVICE
(
0x07b8
,
0x6001
),
.
driver_info
=
DEVICE_ZD1211
},
{
USB_DEVICE
(
0x126f
,
0xa006
),
.
driver_info
=
DEVICE_ZD1211
},
{
USB_DEVICE
(
0x126f
,
0xa006
),
.
driver_info
=
DEVICE_ZD1211
},
{
USB_DEVICE
(
0x6891
,
0xa727
),
.
driver_info
=
DEVICE_ZD1211
},
{
USB_DEVICE
(
0x6891
,
0xa727
),
.
driver_info
=
DEVICE_ZD1211
},
{
USB_DEVICE
(
0x0df6
,
0x9071
),
.
driver_info
=
DEVICE_ZD1211
},
{
USB_DEVICE
(
0x0df6
,
0x9071
),
.
driver_info
=
DEVICE_ZD1211
},
...
@@ -61,6 +60,7 @@ static struct usb_device_id usb_ids[] = {
...
@@ -61,6 +60,7 @@ static struct usb_device_id usb_ids[] = {
{
USB_DEVICE
(
0x157e
,
0x300a
),
.
driver_info
=
DEVICE_ZD1211
},
{
USB_DEVICE
(
0x157e
,
0x300a
),
.
driver_info
=
DEVICE_ZD1211
},
{
USB_DEVICE
(
0x0105
,
0x145f
),
.
driver_info
=
DEVICE_ZD1211
},
{
USB_DEVICE
(
0x0105
,
0x145f
),
.
driver_info
=
DEVICE_ZD1211
},
/* ZD1211B */
/* ZD1211B */
{
USB_DEVICE
(
0x054c
,
0x0257
),
.
driver_info
=
DEVICE_ZD1211B
},
{
USB_DEVICE
(
0x0ace
,
0x1215
),
.
driver_info
=
DEVICE_ZD1211B
},
{
USB_DEVICE
(
0x0ace
,
0x1215
),
.
driver_info
=
DEVICE_ZD1211B
},
{
USB_DEVICE
(
0x0ace
,
0xb215
),
.
driver_info
=
DEVICE_ZD1211B
},
{
USB_DEVICE
(
0x0ace
,
0xb215
),
.
driver_info
=
DEVICE_ZD1211B
},
{
USB_DEVICE
(
0x157e
,
0x300d
),
.
driver_info
=
DEVICE_ZD1211B
},
{
USB_DEVICE
(
0x157e
,
0x300d
),
.
driver_info
=
DEVICE_ZD1211B
},
...
@@ -87,6 +87,7 @@ static struct usb_device_id usb_ids[] = {
...
@@ -87,6 +87,7 @@ static struct usb_device_id usb_ids[] = {
{
USB_DEVICE
(
0x0471
,
0x1237
),
.
driver_info
=
DEVICE_ZD1211B
},
{
USB_DEVICE
(
0x0471
,
0x1237
),
.
driver_info
=
DEVICE_ZD1211B
},
{
USB_DEVICE
(
0x07fa
,
0x1196
),
.
driver_info
=
DEVICE_ZD1211B
},
{
USB_DEVICE
(
0x07fa
,
0x1196
),
.
driver_info
=
DEVICE_ZD1211B
},
{
USB_DEVICE
(
0x0df6
,
0x0036
),
.
driver_info
=
DEVICE_ZD1211B
},
{
USB_DEVICE
(
0x0df6
,
0x0036
),
.
driver_info
=
DEVICE_ZD1211B
},
{
USB_DEVICE
(
0x07b8
,
0x6001
),
.
driver_info
=
DEVICE_ZD1211B
},
/* "Driverless" devices that need ejecting */
/* "Driverless" devices that need ejecting */
{
USB_DEVICE
(
0x0ace
,
0x2011
),
.
driver_info
=
DEVICE_INSTALLER
},
{
USB_DEVICE
(
0x0ace
,
0x2011
),
.
driver_info
=
DEVICE_INSTALLER
},
{
USB_DEVICE
(
0x0ace
,
0x20ff
),
.
driver_info
=
DEVICE_INSTALLER
},
{
USB_DEVICE
(
0x0ace
,
0x20ff
),
.
driver_info
=
DEVICE_INSTALLER
},
...
...
drivers/platform/x86/hp-wmi.c
浏览文件 @
d2daeabf
...
@@ -171,7 +171,7 @@ static int hp_wmi_tablet_state(void)
...
@@ -171,7 +171,7 @@ static int hp_wmi_tablet_state(void)
static
int
hp_wmi_set_block
(
void
*
data
,
bool
blocked
)
static
int
hp_wmi_set_block
(
void
*
data
,
bool
blocked
)
{
{
unsigned
long
b
=
(
unsigned
long
)
data
;
unsigned
long
b
=
(
unsigned
long
)
data
;
int
query
=
BIT
(
b
+
8
)
|
((
!
!
blocked
)
<<
b
);
int
query
=
BIT
(
b
+
8
)
|
((
!
blocked
)
<<
b
);
return
hp_wmi_perform_query
(
HPWMI_WIRELESS_QUERY
,
1
,
query
);
return
hp_wmi_perform_query
(
HPWMI_WIRELESS_QUERY
,
1
,
query
);
}
}
...
...
drivers/ssb/pcmcia.c
浏览文件 @
d2daeabf
...
@@ -678,7 +678,8 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
...
@@ -678,7 +678,8 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
sprom
->
board_rev
=
tuple
.
TupleData
[
1
];
sprom
->
board_rev
=
tuple
.
TupleData
[
1
];
break
;
break
;
case
SSB_PCMCIA_CIS_PA
:
case
SSB_PCMCIA_CIS_PA
:
GOTO_ERROR_ON
(
tuple
.
TupleDataLen
!=
9
,
GOTO_ERROR_ON
((
tuple
.
TupleDataLen
!=
9
)
&&
(
tuple
.
TupleDataLen
!=
10
),
"pa tpl size"
);
"pa tpl size"
);
sprom
->
pa0b0
=
tuple
.
TupleData
[
1
]
|
sprom
->
pa0b0
=
tuple
.
TupleData
[
1
]
|
((
u16
)
tuple
.
TupleData
[
2
]
<<
8
);
((
u16
)
tuple
.
TupleData
[
2
]
<<
8
);
...
@@ -718,7 +719,8 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
...
@@ -718,7 +719,8 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
sprom
->
antenna_gain
.
ghz5
.
a3
=
tuple
.
TupleData
[
1
];
sprom
->
antenna_gain
.
ghz5
.
a3
=
tuple
.
TupleData
[
1
];
break
;
break
;
case
SSB_PCMCIA_CIS_BFLAGS
:
case
SSB_PCMCIA_CIS_BFLAGS
:
GOTO_ERROR_ON
(
tuple
.
TupleDataLen
!=
3
,
GOTO_ERROR_ON
((
tuple
.
TupleDataLen
!=
3
)
&&
(
tuple
.
TupleDataLen
!=
5
),
"bfl tpl size"
);
"bfl tpl size"
);
sprom
->
boardflags_lo
=
tuple
.
TupleData
[
1
]
|
sprom
->
boardflags_lo
=
tuple
.
TupleData
[
1
]
|
((
u16
)
tuple
.
TupleData
[
2
]
<<
8
);
((
u16
)
tuple
.
TupleData
[
2
]
<<
8
);
...
...
include/linux/rfkill.h
浏览文件 @
d2daeabf
...
@@ -99,7 +99,6 @@ enum rfkill_user_states {
...
@@ -99,7 +99,6 @@ enum rfkill_user_states {
#undef RFKILL_STATE_UNBLOCKED
#undef RFKILL_STATE_UNBLOCKED
#undef RFKILL_STATE_HARD_BLOCKED
#undef RFKILL_STATE_HARD_BLOCKED
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/kernel.h>
#include <linux/list.h>
#include <linux/list.h>
#include <linux/mutex.h>
#include <linux/mutex.h>
...
...
net/mac80211/mesh_hwmp.c
浏览文件 @
d2daeabf
...
@@ -637,7 +637,7 @@ static void mesh_queue_preq(struct mesh_path *mpath, u8 flags)
...
@@ -637,7 +637,7 @@ static void mesh_queue_preq(struct mesh_path *mpath, u8 flags)
struct
ieee80211_if_mesh
*
ifmsh
=
&
sdata
->
u
.
mesh
;
struct
ieee80211_if_mesh
*
ifmsh
=
&
sdata
->
u
.
mesh
;
struct
mesh_preq_queue
*
preq_node
;
struct
mesh_preq_queue
*
preq_node
;
preq_node
=
kmalloc
(
sizeof
(
struct
mesh_preq_queue
),
GFP_
KERNEL
);
preq_node
=
kmalloc
(
sizeof
(
struct
mesh_preq_queue
),
GFP_
ATOMIC
);
if
(
!
preq_node
)
{
if
(
!
preq_node
)
{
printk
(
KERN_DEBUG
"Mesh HWMP: could not allocate PREQ node
\n
"
);
printk
(
KERN_DEBUG
"Mesh HWMP: could not allocate PREQ node
\n
"
);
return
;
return
;
...
...
net/mac80211/rc80211_minstrel.c
浏览文件 @
d2daeabf
...
@@ -66,7 +66,7 @@ rix_to_ndx(struct minstrel_sta_info *mi, int rix)
...
@@ -66,7 +66,7 @@ rix_to_ndx(struct minstrel_sta_info *mi, int rix)
for
(
i
=
rix
;
i
>=
0
;
i
--
)
for
(
i
=
rix
;
i
>=
0
;
i
--
)
if
(
mi
->
r
[
i
].
rix
==
rix
)
if
(
mi
->
r
[
i
].
rix
==
rix
)
break
;
break
;
WARN_ON
(
mi
->
r
[
i
].
rix
!=
rix
);
WARN_ON
(
i
<
0
);
return
i
;
return
i
;
}
}
...
@@ -181,6 +181,9 @@ minstrel_tx_status(void *priv, struct ieee80211_supported_band *sband,
...
@@ -181,6 +181,9 @@ minstrel_tx_status(void *priv, struct ieee80211_supported_band *sband,
break
;
break
;
ndx
=
rix_to_ndx
(
mi
,
ar
[
i
].
idx
);
ndx
=
rix_to_ndx
(
mi
,
ar
[
i
].
idx
);
if
(
ndx
<
0
)
continue
;
mi
->
r
[
ndx
].
attempts
+=
ar
[
i
].
count
;
mi
->
r
[
ndx
].
attempts
+=
ar
[
i
].
count
;
if
((
i
!=
IEEE80211_TX_MAX_RATES
-
1
)
&&
(
ar
[
i
+
1
].
idx
<
0
))
if
((
i
!=
IEEE80211_TX_MAX_RATES
-
1
)
&&
(
ar
[
i
+
1
].
idx
<
0
))
...
...
net/wireless/nl80211.c
浏览文件 @
d2daeabf
...
@@ -447,6 +447,7 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
...
@@ -447,6 +447,7 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
rdev
=
__cfg80211_drv_from_info
(
info
);
rdev
=
__cfg80211_drv_from_info
(
info
);
if
(
IS_ERR
(
rdev
))
{
if
(
IS_ERR
(
rdev
))
{
mutex_unlock
(
&
cfg80211_mutex
);
result
=
PTR_ERR
(
rdev
);
result
=
PTR_ERR
(
rdev
);
goto
unlock
;
goto
unlock
;
}
}
...
...
net/wireless/scan.c
浏览文件 @
d2daeabf
...
@@ -366,7 +366,6 @@ cfg80211_bss_update(struct cfg80211_registered_device *dev,
...
@@ -366,7 +366,6 @@ cfg80211_bss_update(struct cfg80211_registered_device *dev,
found
=
rb_find_bss
(
dev
,
res
);
found
=
rb_find_bss
(
dev
,
res
);
if
(
found
)
{
if
(
found
)
{
kref_get
(
&
found
->
ref
);
found
->
pub
.
beacon_interval
=
res
->
pub
.
beacon_interval
;
found
->
pub
.
beacon_interval
=
res
->
pub
.
beacon_interval
;
found
->
pub
.
tsf
=
res
->
pub
.
tsf
;
found
->
pub
.
tsf
=
res
->
pub
.
tsf
;
found
->
pub
.
signal
=
res
->
pub
.
signal
;
found
->
pub
.
signal
=
res
->
pub
.
signal
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录