Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
_Walt
cloud-kernel
提交
0e5606e4
cloud-kernel
项目概览
_Walt
/
cloud-kernel
与 Fork 源项目一致
Fork自
openanolis / cloud-kernel
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0e5606e4
编写于
3月 26, 2008
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
上级
7c0ecc4c
7a193a5d
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
32 addition
and
32 deletion
+32
-32
MAINTAINERS
MAINTAINERS
+1
-1
drivers/net/wireless/arlan-proc.c
drivers/net/wireless/arlan-proc.c
+0
-8
drivers/net/wireless/b43/debugfs.c
drivers/net/wireless/b43/debugfs.c
+2
-2
drivers/net/wireless/b43/dma.c
drivers/net/wireless/b43/dma.c
+20
-12
drivers/net/wireless/b43/main.c
drivers/net/wireless/b43/main.c
+0
-2
drivers/net/wireless/iwlwifi/Kconfig
drivers/net/wireless/iwlwifi/Kconfig
+2
-2
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
+2
-2
drivers/net/wireless/iwlwifi/iwl4965-base.c
drivers/net/wireless/iwlwifi/iwl4965-base.c
+2
-2
drivers/net/wireless/rt2x00/rt73usb.c
drivers/net/wireless/rt2x00/rt73usb.c
+2
-0
drivers/net/wireless/wavelan_cs.h
drivers/net/wireless/wavelan_cs.h
+1
-1
未找到文件。
MAINTAINERS
浏览文件 @
0e5606e4
...
...
@@ -2110,7 +2110,7 @@ M: reinette.chatre@intel.com
L: linux-wireless@vger.kernel.org
L: ipw3945-devel@lists.sourceforge.net
W: http://intellinuxwireless.org
T: git git://
intellinuxwireless.org/repos/iwlwifi
T: git git://
git.kernel.org/pub/scm/linux/kernel/git/rchatre/iwlwifi-2.6.git
S: Supported
IOC3 ETHERNET DRIVER
...
...
drivers/net/wireless/arlan-proc.c
浏览文件 @
0e5606e4
...
...
@@ -1197,13 +1197,6 @@ static ctl_table arlan_table[] =
#else
static
ctl_table
arlan_table
[
MAX_ARLANS
+
1
]
=
{
{
.
ctl_name
=
0
}
};
#endif
#else
static
ctl_table
arlan_table
[
MAX_ARLANS
+
1
]
=
{
{
.
ctl_name
=
0
}
...
...
@@ -1233,7 +1226,6 @@ static ctl_table arlan_root_table[] =
//};
#ifdef CONFIG_PROC_FS
static
struct
ctl_table_header
*
arlan_device_sysctl_header
;
int
__init
init_arlan_proc
(
void
)
...
...
drivers/net/wireless/b43/debugfs.c
浏览文件 @
0e5606e4
...
...
@@ -618,6 +618,7 @@ void b43_debugfs_remove_device(struct b43_wldev *dev)
kfree
(
e
);
}
/* Called with IRQs disabled. */
void
b43_debugfs_log_txstat
(
struct
b43_wldev
*
dev
,
const
struct
b43_txstatus
*
status
)
{
...
...
@@ -629,8 +630,7 @@ void b43_debugfs_log_txstat(struct b43_wldev *dev,
if
(
!
e
)
return
;
log
=
&
e
->
txstatlog
;
B43_WARN_ON
(
!
irqs_disabled
());
spin_lock
(
&
log
->
lock
);
spin_lock
(
&
log
->
lock
);
/* IRQs are already disabled. */
i
=
log
->
end
+
1
;
if
(
i
==
B43_NR_LOGGED_TXSTATUS
)
i
=
0
;
...
...
drivers/net/wireless/b43/dma.c
浏览文件 @
0e5606e4
...
...
@@ -560,7 +560,7 @@ static int b43_dmacontroller_tx_reset(struct b43_wldev *dev, u16 mmio_base,
/* Check if a DMA mapping address is invalid. */
static
bool
b43_dma_mapping_error
(
struct
b43_dmaring
*
ring
,
dma_addr_t
addr
,
size_t
buffersize
)
size_t
buffersize
,
bool
dma_to_device
)
{
if
(
unlikely
(
dma_mapping_error
(
addr
)))
return
1
;
...
...
@@ -568,11 +568,11 @@ static bool b43_dma_mapping_error(struct b43_dmaring *ring,
switch
(
ring
->
type
)
{
case
B43_DMA_30BIT
:
if
((
u64
)
addr
+
buffersize
>
(
1ULL
<<
30
))
return
1
;
goto
address_error
;
break
;
case
B43_DMA_32BIT
:
if
((
u64
)
addr
+
buffersize
>
(
1ULL
<<
32
))
return
1
;
goto
address_error
;
break
;
case
B43_DMA_64BIT
:
/* Currently we can't have addresses beyond
...
...
@@ -582,6 +582,12 @@ static bool b43_dma_mapping_error(struct b43_dmaring *ring,
/* The address is OK. */
return
0
;
address_error:
/* We can't support this address. Unmap it again. */
unmap_descbuffer
(
ring
,
addr
,
buffersize
,
dma_to_device
);
return
1
;
}
static
int
setup_rx_descbuffer
(
struct
b43_dmaring
*
ring
,
...
...
@@ -599,7 +605,7 @@ static int setup_rx_descbuffer(struct b43_dmaring *ring,
if
(
unlikely
(
!
skb
))
return
-
ENOMEM
;
dmaaddr
=
map_descbuffer
(
ring
,
skb
->
data
,
ring
->
rx_buffersize
,
0
);
if
(
b43_dma_mapping_error
(
ring
,
dmaaddr
,
ring
->
rx_buffersize
))
{
if
(
b43_dma_mapping_error
(
ring
,
dmaaddr
,
ring
->
rx_buffersize
,
0
))
{
/* ugh. try to realloc in zone_dma */
gfp_flags
|=
GFP_DMA
;
...
...
@@ -612,7 +618,7 @@ static int setup_rx_descbuffer(struct b43_dmaring *ring,
ring
->
rx_buffersize
,
0
);
}
if
(
b43_dma_mapping_error
(
ring
,
dmaaddr
,
ring
->
rx_buffersize
))
{
if
(
b43_dma_mapping_error
(
ring
,
dmaaddr
,
ring
->
rx_buffersize
,
0
))
{
dev_kfree_skb_any
(
skb
);
return
-
EIO
;
}
...
...
@@ -852,7 +858,8 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev,
b43_txhdr_size
(
dev
),
DMA_TO_DEVICE
);
if
(
b43_dma_mapping_error
(
ring
,
dma_test
,
b43_txhdr_size
(
dev
)))
{
if
(
b43_dma_mapping_error
(
ring
,
dma_test
,
b43_txhdr_size
(
dev
),
1
))
{
/* ugh realloc */
kfree
(
ring
->
txhdr_cache
);
ring
->
txhdr_cache
=
kcalloc
(
nr_slots
,
...
...
@@ -867,7 +874,7 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev,
DMA_TO_DEVICE
);
if
(
b43_dma_mapping_error
(
ring
,
dma_test
,
b43_txhdr_size
(
dev
)))
b43_txhdr_size
(
dev
)
,
1
))
goto
err_kfree_txhdr_cache
;
}
...
...
@@ -1189,7 +1196,7 @@ static int dma_tx_fragment(struct b43_dmaring *ring,
meta_hdr
->
dmaaddr
=
map_descbuffer
(
ring
,
(
unsigned
char
*
)
header
,
hdrsize
,
1
);
if
(
b43_dma_mapping_error
(
ring
,
meta_hdr
->
dmaaddr
,
hdrsize
))
{
if
(
b43_dma_mapping_error
(
ring
,
meta_hdr
->
dmaaddr
,
hdrsize
,
1
))
{
ring
->
current_slot
=
old_top_slot
;
ring
->
used_slots
=
old_used_slots
;
return
-
EIO
;
...
...
@@ -1208,7 +1215,7 @@ static int dma_tx_fragment(struct b43_dmaring *ring,
meta
->
dmaaddr
=
map_descbuffer
(
ring
,
skb
->
data
,
skb
->
len
,
1
);
/* create a bounce buffer in zone_dma on mapping failure. */
if
(
b43_dma_mapping_error
(
ring
,
meta
->
dmaaddr
,
skb
->
len
))
{
if
(
b43_dma_mapping_error
(
ring
,
meta
->
dmaaddr
,
skb
->
len
,
1
))
{
bounce_skb
=
__dev_alloc_skb
(
skb
->
len
,
GFP_ATOMIC
|
GFP_DMA
);
if
(
!
bounce_skb
)
{
ring
->
current_slot
=
old_top_slot
;
...
...
@@ -1222,7 +1229,7 @@ static int dma_tx_fragment(struct b43_dmaring *ring,
skb
=
bounce_skb
;
meta
->
skb
=
skb
;
meta
->
dmaaddr
=
map_descbuffer
(
ring
,
skb
->
data
,
skb
->
len
,
1
);
if
(
b43_dma_mapping_error
(
ring
,
meta
->
dmaaddr
,
skb
->
len
))
{
if
(
b43_dma_mapping_error
(
ring
,
meta
->
dmaaddr
,
skb
->
len
,
1
))
{
ring
->
current_slot
=
old_top_slot
;
ring
->
used_slots
=
old_used_slots
;
err
=
-
EIO
;
...
...
@@ -1337,6 +1344,7 @@ int b43_dma_tx(struct b43_wldev *dev,
return
err
;
}
/* Called with IRQs disabled. */
void
b43_dma_handle_txstatus
(
struct
b43_wldev
*
dev
,
const
struct
b43_txstatus
*
status
)
{
...
...
@@ -1349,8 +1357,8 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev,
ring
=
parse_cookie
(
dev
,
status
->
cookie
,
&
slot
);
if
(
unlikely
(
!
ring
))
return
;
B43_WARN_ON
(
!
irqs_disabled
());
spin_lock
(
&
ring
->
lock
);
spin_lock
(
&
ring
->
lock
);
/* IRQs are already disabled. */
B43_WARN_ON
(
!
ring
->
tx
);
ops
=
ring
->
ops
;
...
...
drivers/net/wireless/b43/main.c
浏览文件 @
0e5606e4
...
...
@@ -2049,7 +2049,6 @@ void b43_mac_enable(struct b43_wldev *dev)
{
dev
->
mac_suspended
--
;
B43_WARN_ON
(
dev
->
mac_suspended
<
0
);
B43_WARN_ON
(
irqs_disabled
());
if
(
dev
->
mac_suspended
==
0
)
{
b43_write32
(
dev
,
B43_MMIO_MACCTL
,
b43_read32
(
dev
,
B43_MMIO_MACCTL
)
...
...
@@ -2075,7 +2074,6 @@ void b43_mac_suspend(struct b43_wldev *dev)
u32
tmp
;
might_sleep
();
B43_WARN_ON
(
irqs_disabled
());
B43_WARN_ON
(
dev
->
mac_suspended
<
0
);
if
(
dev
->
mac_suspended
==
0
)
{
...
...
drivers/net/wireless/iwlwifi/Kconfig
浏览文件 @
0e5606e4
...
...
@@ -20,7 +20,7 @@ config IWL4965
runs.
If you want to compile the driver as a module ( = code which can be
inserted in and rem
vo
ed from the running kernel whenever you want),
inserted in and rem
ov
ed from the running kernel whenever you want),
say M here and read <file:Documentation/kbuild/modules.txt>. The
module will be called iwl4965.ko.
...
...
@@ -101,7 +101,7 @@ config IWL3945
runs.
If you want to compile the driver as a module ( = code which can be
inserted in and rem
vo
ed from the running kernel whenever you want),
inserted in and rem
ov
ed from the running kernel whenever you want),
say M here and read <file:Documentation/kbuild/modules.txt>. The
module will be called iwl3945.ko.
...
...
drivers/net/wireless/iwlwifi/iwl3945-base.c
浏览文件 @
0e5606e4
...
...
@@ -6206,11 +6206,11 @@ static void iwl3945_alive_start(struct iwl3945_priv *priv)
/* At this point, the NIC is initialized and operational */
priv
->
notif_missed_beacons
=
0
;
set_bit
(
STATUS_READY
,
&
priv
->
status
);
iwl3945_reg_txpower_periodic
(
priv
);
IWL_DEBUG_INFO
(
"ALIVE processing complete.
\n
"
);
set_bit
(
STATUS_READY
,
&
priv
->
status
);
wake_up_interruptible
(
&
priv
->
wait_command_queue
);
if
(
priv
->
error_recovering
)
...
...
@@ -8706,7 +8706,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
return
err
;
}
static
void
iwl3945_pci_remove
(
struct
pci_dev
*
pdev
)
static
void
__devexit
iwl3945_pci_remove
(
struct
pci_dev
*
pdev
)
{
struct
iwl3945_priv
*
priv
=
pci_get_drvdata
(
pdev
);
struct
list_head
*
p
,
*
q
;
...
...
drivers/net/wireless/iwlwifi/iwl4965-base.c
浏览文件 @
0e5606e4
...
...
@@ -6628,11 +6628,11 @@ static void iwl4965_alive_start(struct iwl4965_priv *priv)
/* At this point, the NIC is initialized and operational */
priv
->
notif_missed_beacons
=
0
;
set_bit
(
STATUS_READY
,
&
priv
->
status
);
iwl4965_rf_kill_ct_config
(
priv
);
IWL_DEBUG_INFO
(
"ALIVE processing complete.
\n
"
);
set_bit
(
STATUS_READY
,
&
priv
->
status
);
wake_up_interruptible
(
&
priv
->
wait_command_queue
);
if
(
priv
->
error_recovering
)
...
...
@@ -9282,7 +9282,7 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
return
err
;
}
static
void
iwl4965_pci_remove
(
struct
pci_dev
*
pdev
)
static
void
__devexit
iwl4965_pci_remove
(
struct
pci_dev
*
pdev
)
{
struct
iwl4965_priv
*
priv
=
pci_get_drvdata
(
pdev
);
struct
list_head
*
p
,
*
q
;
...
...
drivers/net/wireless/rt2x00/rt73usb.c
浏览文件 @
0e5606e4
...
...
@@ -2095,6 +2095,8 @@ static struct usb_device_id rt73usb_device_table[] = {
{
USB_DEVICE
(
0x1371
,
0x9032
),
USB_DEVICE_DATA
(
&
rt73usb_ops
)
},
/* Conceptronic */
{
USB_DEVICE
(
0x14b2
,
0x3c22
),
USB_DEVICE_DATA
(
&
rt73usb_ops
)
},
/* Corega */
{
USB_DEVICE
(
0x07aa
,
0x002e
),
USB_DEVICE_DATA
(
&
rt73usb_ops
)
},
/* D-Link */
{
USB_DEVICE
(
0x07d1
,
0x3c03
),
USB_DEVICE_DATA
(
&
rt73usb_ops
)
},
{
USB_DEVICE
(
0x07d1
,
0x3c04
),
USB_DEVICE_DATA
(
&
rt73usb_ops
)
},
...
...
drivers/net/wireless/wavelan_cs.h
浏览文件 @
0e5606e4
...
...
@@ -309,7 +309,7 @@ struct mmw_t
#define MMW_EXT_ANT_INTERNAL 0x00
/* Internal antenna */
#define MMW_EXT_ANT_EXTERNAL 0x03
/* External antenna */
#define MMW_EXT_ANT_IQ_TEST 0x1C
/* IQ test pattern (set to 0) */
};
}
__attribute__
((
packed
))
;
/* Size for structure checking (if padding is correct) */
#define MMW_SIZE 37
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录