Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
e1cc1c57
C
clone-Linux
项目概览
gsplhtlxg
/
clone-Linux
通知
2
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
clone-Linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e1cc1c57
编写于
5月 09, 2009
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'net-fixes' of
git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
上级
9d34d1a2
7aa6a478
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
19 addition
and
18 deletion
+19
-18
arch/arm/mach-ixp4xx/ixp4xx_npe.c
arch/arm/mach-ixp4xx/ixp4xx_npe.c
+1
-1
drivers/net/arm/ixp4xx_eth.c
drivers/net/arm/ixp4xx_eth.c
+16
-15
drivers/net/wan/ixp4xx_hss.c
drivers/net/wan/ixp4xx_hss.c
+2
-2
未找到文件。
arch/arm/mach-ixp4xx/ixp4xx_npe.c
浏览文件 @
e1cc1c57
...
@@ -714,7 +714,7 @@ static int __init npe_init_module(void)
...
@@ -714,7 +714,7 @@ static int __init npe_init_module(void)
}
}
if
(
!
found
)
if
(
!
found
)
return
-
ENO
SYS
;
return
-
ENO
DEV
;
return
0
;
return
0
;
}
}
...
...
drivers/net/arm/ixp4xx_eth.c
浏览文件 @
e1cc1c57
...
@@ -338,12 +338,12 @@ static int ixp4xx_mdio_register(void)
...
@@ -338,12 +338,12 @@ static int ixp4xx_mdio_register(void)
if
(
cpu_is_ixp43x
())
{
if
(
cpu_is_ixp43x
())
{
/* IXP43x lacks NPE-B and uses NPE-C for MII PHY access */
/* IXP43x lacks NPE-B and uses NPE-C for MII PHY access */
if
(
!
(
ixp4xx_read_feature_bits
()
&
IXP4XX_FEATURE_NPEC_ETH
))
if
(
!
(
ixp4xx_read_feature_bits
()
&
IXP4XX_FEATURE_NPEC_ETH
))
return
-
ENO
SYS
;
return
-
ENO
DEV
;
mdio_regs
=
(
struct
eth_regs
__iomem
*
)
IXP4XX_EthC_BASE_VIRT
;
mdio_regs
=
(
struct
eth_regs
__iomem
*
)
IXP4XX_EthC_BASE_VIRT
;
}
else
{
}
else
{
/* All MII PHY accesses use NPE-B Ethernet registers */
/* All MII PHY accesses use NPE-B Ethernet registers */
if
(
!
(
ixp4xx_read_feature_bits
()
&
IXP4XX_FEATURE_NPEB_ETH0
))
if
(
!
(
ixp4xx_read_feature_bits
()
&
IXP4XX_FEATURE_NPEB_ETH0
))
return
-
ENO
SYS
;
return
-
ENO
DEV
;
mdio_regs
=
(
struct
eth_regs
__iomem
*
)
IXP4XX_EthB_BASE_VIRT
;
mdio_regs
=
(
struct
eth_regs
__iomem
*
)
IXP4XX_EthB_BASE_VIRT
;
}
}
...
@@ -1174,7 +1174,7 @@ static int __devinit eth_init_one(struct platform_device *pdev)
...
@@ -1174,7 +1174,7 @@ static int __devinit eth_init_one(struct platform_device *pdev)
regs_phys
=
IXP4XX_EthC_BASE_PHYS
;
regs_phys
=
IXP4XX_EthC_BASE_PHYS
;
break
;
break
;
default:
default:
err
=
-
ENO
SYS
;
err
=
-
ENO
DEV
;
goto
err_free
;
goto
err_free
;
}
}
...
@@ -1189,15 +1189,10 @@ static int __devinit eth_init_one(struct platform_device *pdev)
...
@@ -1189,15 +1189,10 @@ static int __devinit eth_init_one(struct platform_device *pdev)
goto
err_free
;
goto
err_free
;
}
}
if
(
register_netdev
(
dev
))
{
err
=
-
EIO
;
goto
err_npe_rel
;
}
port
->
mem_res
=
request_mem_region
(
regs_phys
,
REGS_SIZE
,
dev
->
name
);
port
->
mem_res
=
request_mem_region
(
regs_phys
,
REGS_SIZE
,
dev
->
name
);
if
(
!
port
->
mem_res
)
{
if
(
!
port
->
mem_res
)
{
err
=
-
EBUSY
;
err
=
-
EBUSY
;
goto
err_
unreg
;
goto
err_
npe_rel
;
}
}
port
->
plat
=
plat
;
port
->
plat
=
plat
;
...
@@ -1215,20 +1210,25 @@ static int __devinit eth_init_one(struct platform_device *pdev)
...
@@ -1215,20 +1210,25 @@ static int __devinit eth_init_one(struct platform_device *pdev)
snprintf
(
phy_id
,
BUS_ID_SIZE
,
PHY_ID_FMT
,
"0"
,
plat
->
phy
);
snprintf
(
phy_id
,
BUS_ID_SIZE
,
PHY_ID_FMT
,
"0"
,
plat
->
phy
);
port
->
phydev
=
phy_connect
(
dev
,
phy_id
,
&
ixp4xx_adjust_link
,
0
,
port
->
phydev
=
phy_connect
(
dev
,
phy_id
,
&
ixp4xx_adjust_link
,
0
,
PHY_INTERFACE_MODE_MII
);
PHY_INTERFACE_MODE_MII
);
if
(
IS_ERR
(
port
->
phydev
))
{
if
((
err
=
IS_ERR
(
port
->
phydev
)))
printk
(
KERN_ERR
"%s: Could not attach to PHY
\n
"
,
dev
->
name
);
goto
err_free_mem
;
return
PTR_ERR
(
port
->
phydev
);
}
port
->
phydev
->
irq
=
PHY_POLL
;
port
->
phydev
->
irq
=
PHY_POLL
;
if
((
err
=
register_netdev
(
dev
)))
goto
err_phy_dis
;
printk
(
KERN_INFO
"%s: MII PHY %i on %s
\n
"
,
dev
->
name
,
plat
->
phy
,
printk
(
KERN_INFO
"%s: MII PHY %i on %s
\n
"
,
dev
->
name
,
plat
->
phy
,
npe_name
(
port
->
npe
));
npe_name
(
port
->
npe
));
return
0
;
return
0
;
err_unreg:
err_phy_dis:
unregister_netdev
(
dev
);
phy_disconnect
(
port
->
phydev
);
err_free_mem:
npe_port_tab
[
NPE_ID
(
port
->
id
)]
=
NULL
;
platform_set_drvdata
(
pdev
,
NULL
);
release_resource
(
port
->
mem_res
);
err_npe_rel:
err_npe_rel:
npe_release
(
port
->
npe
);
npe_release
(
port
->
npe
);
err_free:
err_free:
...
@@ -1242,6 +1242,7 @@ static int __devexit eth_remove_one(struct platform_device *pdev)
...
@@ -1242,6 +1242,7 @@ static int __devexit eth_remove_one(struct platform_device *pdev)
struct
port
*
port
=
netdev_priv
(
dev
);
struct
port
*
port
=
netdev_priv
(
dev
);
unregister_netdev
(
dev
);
unregister_netdev
(
dev
);
phy_disconnect
(
port
->
phydev
);
npe_port_tab
[
NPE_ID
(
port
->
id
)]
=
NULL
;
npe_port_tab
[
NPE_ID
(
port
->
id
)]
=
NULL
;
platform_set_drvdata
(
pdev
,
NULL
);
platform_set_drvdata
(
pdev
,
NULL
);
npe_release
(
port
->
npe
);
npe_release
(
port
->
npe
);
...
...
drivers/net/wan/ixp4xx_hss.c
浏览文件 @
e1cc1c57
...
@@ -1249,7 +1249,7 @@ static int __devinit hss_init_one(struct platform_device *pdev)
...
@@ -1249,7 +1249,7 @@ static int __devinit hss_init_one(struct platform_device *pdev)
return
-
ENOMEM
;
return
-
ENOMEM
;
if
((
port
->
npe
=
npe_request
(
0
))
==
NULL
)
{
if
((
port
->
npe
=
npe_request
(
0
))
==
NULL
)
{
err
=
-
ENO
SYS
;
err
=
-
ENO
DEV
;
goto
err_free
;
goto
err_free
;
}
}
...
@@ -1311,7 +1311,7 @@ static int __init hss_init_module(void)
...
@@ -1311,7 +1311,7 @@ static int __init hss_init_module(void)
if
((
ixp4xx_read_feature_bits
()
&
if
((
ixp4xx_read_feature_bits
()
&
(
IXP4XX_FEATURE_HDLC
|
IXP4XX_FEATURE_HSS
))
!=
(
IXP4XX_FEATURE_HDLC
|
IXP4XX_FEATURE_HSS
))
!=
(
IXP4XX_FEATURE_HDLC
|
IXP4XX_FEATURE_HSS
))
(
IXP4XX_FEATURE_HDLC
|
IXP4XX_FEATURE_HSS
))
return
-
ENO
SYS
;
return
-
ENO
DEV
;
spin_lock_init
(
&
npe_lock
);
spin_lock_init
(
&
npe_lock
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录