Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
bug2833
cloud-kernel
提交
8d8b0329
cloud-kernel
项目概览
bug2833
/
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,发现更多精彩内容 >>
提交
8d8b0329
编写于
8月 24, 2006
作者:
J
Jeff Garzik
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'upstream-fixes' into upstream
上级
c67eebd6
357eb4cf
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
37 addition
and
14 deletion
+37
-14
drivers/net/3c515.c
drivers/net/3c515.c
+2
-1
drivers/net/pcmcia/xirc2ps_cs.c
drivers/net/pcmcia/xirc2ps_cs.c
+14
-4
drivers/net/pcnet32.c
drivers/net/pcnet32.c
+17
-8
drivers/net/wireless/hostap/hostap_hw.c
drivers/net/wireless/hostap/hostap_hw.c
+3
-0
drivers/net/wireless/spectrum_cs.c
drivers/net/wireless/spectrum_cs.c
+1
-1
未找到文件。
drivers/net/3c515.c
浏览文件 @
8d8b0329
...
...
@@ -1003,7 +1003,8 @@ static int corkscrew_start_xmit(struct sk_buff *skb,
/* Calculate the next Tx descriptor entry. */
int
entry
=
vp
->
cur_tx
%
TX_RING_SIZE
;
struct
boom_tx_desc
*
prev_entry
;
unsigned
long
flags
,
i
;
unsigned
long
flags
;
int
i
;
if
(
vp
->
tx_full
)
/* No room to transmit with */
return
1
;
...
...
drivers/net/pcmcia/xirc2ps_cs.c
浏览文件 @
8d8b0329
...
...
@@ -345,6 +345,7 @@ typedef struct local_info_t {
void
__iomem
*
dingo_ccr
;
/* only used for CEM56 cards */
unsigned
last_ptr_value
;
/* last packets transmitted value */
const
char
*
manf_str
;
struct
work_struct
tx_timeout_task
;
}
local_info_t
;
/****************
...
...
@@ -352,6 +353,7 @@ typedef struct local_info_t {
*/
static
int
do_start_xmit
(
struct
sk_buff
*
skb
,
struct
net_device
*
dev
);
static
void
do_tx_timeout
(
struct
net_device
*
dev
);
static
void
xirc2ps_tx_timeout_task
(
void
*
data
);
static
struct
net_device_stats
*
do_get_stats
(
struct
net_device
*
dev
);
static
void
set_addresses
(
struct
net_device
*
dev
);
static
void
set_multicast_list
(
struct
net_device
*
dev
);
...
...
@@ -589,6 +591,7 @@ xirc2ps_probe(struct pcmcia_device *link)
#ifdef HAVE_TX_TIMEOUT
dev
->
tx_timeout
=
do_tx_timeout
;
dev
->
watchdog_timeo
=
TX_TIMEOUT
;
INIT_WORK
(
&
local
->
tx_timeout_task
,
xirc2ps_tx_timeout_task
,
dev
);
#endif
return
xirc2ps_config
(
link
);
...
...
@@ -1341,17 +1344,24 @@ xirc2ps_interrupt(int irq, void *dev_id, struct pt_regs *regs)
/*====================================================================*/
static
void
do_tx_timeout
(
struct
net_device
*
dev
)
xirc2ps_tx_timeout_task
(
void
*
data
)
{
local_info_t
*
lp
=
netdev_priv
(
dev
);
printk
(
KERN_NOTICE
"%s: transmit timed out
\n
"
,
dev
->
name
);
lp
->
stats
.
tx_errors
++
;
struct
net_device
*
dev
=
data
;
/* reset the card */
do_reset
(
dev
,
1
);
dev
->
trans_start
=
jiffies
;
netif_wake_queue
(
dev
);
}
static
void
do_tx_timeout
(
struct
net_device
*
dev
)
{
local_info_t
*
lp
=
netdev_priv
(
dev
);
lp
->
stats
.
tx_errors
++
;
printk
(
KERN_NOTICE
"%s: transmit timed out
\n
"
,
dev
->
name
);
schedule_work
(
&
lp
->
tx_timeout_task
);
}
static
int
do_start_xmit
(
struct
sk_buff
*
skb
,
struct
net_device
*
dev
)
{
...
...
drivers/net/pcnet32.c
浏览文件 @
8d8b0329
...
...
@@ -202,6 +202,8 @@ static int homepna[MAX_UNITS];
#define CSR15 15
#define PCNET32_MC_FILTER 8
#define PCNET32_79C970A 0x2621
/* The PCNET32 Rx and Tx ring descriptors. */
struct
pcnet32_rx_head
{
u32
base
;
...
...
@@ -289,6 +291,7 @@ struct pcnet32_private {
/* each bit indicates an available PHY */
u32
phymask
;
unsigned
short
chip_version
;
/* which variant this is */
};
static
int
pcnet32_probe_pci
(
struct
pci_dev
*
,
const
struct
pci_device_id
*
);
...
...
@@ -724,9 +727,11 @@ static u32 pcnet32_get_link(struct net_device *dev)
spin_lock_irqsave
(
&
lp
->
lock
,
flags
);
if
(
lp
->
mii
)
{
r
=
mii_link_ok
(
&
lp
->
mii_if
);
}
else
{
}
else
if
(
lp
->
chip_version
>=
PCNET32_79C970A
)
{
ulong
ioaddr
=
dev
->
base_addr
;
/* card base I/O address */
r
=
(
lp
->
a
.
read_bcr
(
ioaddr
,
4
)
!=
0xc0
);
}
else
{
/* can not detect link on really old chips */
r
=
1
;
}
spin_unlock_irqrestore
(
&
lp
->
lock
,
flags
);
...
...
@@ -1091,6 +1096,10 @@ static int pcnet32_suspend(struct net_device *dev, unsigned long *flags,
ulong
ioaddr
=
dev
->
base_addr
;
int
ticks
;
/* really old chips have to be stopped. */
if
(
lp
->
chip_version
<
PCNET32_79C970A
)
return
0
;
/* set SUSPEND (SPND) - CSR5 bit 0 */
csr5
=
a
->
read_csr
(
ioaddr
,
CSR5
);
a
->
write_csr
(
ioaddr
,
CSR5
,
csr5
|
CSR5_SUSPEND
);
...
...
@@ -1529,6 +1538,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
lp
->
mii_if
.
reg_num_mask
=
0x1f
;
lp
->
dxsuflo
=
dxsuflo
;
lp
->
mii
=
mii
;
lp
->
chip_version
=
chip_version
;
lp
->
msg_enable
=
pcnet32_debug
;
if
((
cards_found
>=
MAX_UNITS
)
||
(
options
[
cards_found
]
>
sizeof
(
options_mapping
)))
...
...
@@ -1839,10 +1849,7 @@ static int pcnet32_open(struct net_device *dev)
val
|=
2
;
}
else
if
(
lp
->
options
&
PCNET32_PORT_ASEL
)
{
/* workaround of xSeries250, turn on for 79C975 only */
i
=
((
lp
->
a
.
read_csr
(
ioaddr
,
88
)
|
(
lp
->
a
.
read_csr
(
ioaddr
,
89
)
<<
16
))
>>
12
)
&
0xffff
;
if
(
i
==
0x2627
)
if
(
lp
->
chip_version
==
0x2627
)
val
|=
3
;
}
lp
->
a
.
write_bcr
(
ioaddr
,
9
,
val
);
...
...
@@ -1986,9 +1993,11 @@ static int pcnet32_open(struct net_device *dev)
netif_start_queue
(
dev
);
if
(
lp
->
chip_version
>=
PCNET32_79C970A
)
{
/* Print the link status and start the watchdog */
pcnet32_check_media
(
dev
,
1
);
mod_timer
(
&
(
lp
->
watchdog_timer
),
PCNET32_WATCHDOG_TIMEOUT
);
}
i
=
0
;
while
(
i
++
<
100
)
...
...
drivers/net/wireless/hostap/hostap_hw.c
浏览文件 @
8d8b0329
...
...
@@ -1042,6 +1042,9 @@ static int prism2_reset_port(struct net_device *dev)
dev
->
name
,
local
->
fragm_threshold
);
}
/* Some firmwares lose antenna selection settings on reset */
(
void
)
hostap_set_antsel
(
local
);
return
res
;
}
...
...
drivers/net/wireless/spectrum_cs.c
浏览文件 @
8d8b0329
...
...
@@ -242,7 +242,7 @@ spectrum_reset(struct pcmcia_device *link, int idle)
u_int
save_cor
;
/* Doing it if hardware is gone is guaranteed crash */
if
(
pcmcia_dev_present
(
link
))
if
(
!
pcmcia_dev_present
(
link
))
return
-
ENODEV
;
/* Save original COR value */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录