Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
码肥人壮
rt-thread
提交
2721e718
R
rt-thread
项目概览
码肥人壮
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2721e718
编写于
4月 27, 2019
作者:
Lawlieta
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[net][netdev] Fix netdev link_down status, socket create failed issue
Signed-off-by:
chenyong
<
1521761801@qq.com
>
上级
c0a400cc
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
8 addition
and
15 deletion
+8
-15
components/net/netdev/src/netdev.c
components/net/netdev/src/netdev.c
+2
-4
components/net/sal_socket/src/sal_socket.c
components/net/sal_socket/src/sal_socket.c
+6
-11
未找到文件。
components/net/netdev/src/netdev.c
浏览文件 @
2721e718
...
@@ -269,8 +269,7 @@ struct netdev *netdev_get_by_family(int family)
...
@@ -269,8 +269,7 @@ struct netdev *netdev_get_by_family(int family)
{
{
netdev
=
rt_slist_entry
(
node
,
struct
netdev
,
list
);
netdev
=
rt_slist_entry
(
node
,
struct
netdev
,
list
);
pf
=
(
struct
sal_proto_family
*
)
netdev
->
sal_user_data
;
pf
=
(
struct
sal_proto_family
*
)
netdev
->
sal_user_data
;
if
(
pf
&&
pf
->
skt_ops
&&
pf
->
family
==
family
&&
if
(
pf
&&
pf
->
skt_ops
&&
pf
->
family
==
family
&&
netdev_is_up
(
netdev
))
netdev_is_up
(
netdev
)
&&
netdev_is_link_up
(
netdev
))
{
{
rt_hw_interrupt_enable
(
level
);
rt_hw_interrupt_enable
(
level
);
return
netdev
;
return
netdev
;
...
@@ -281,8 +280,7 @@ struct netdev *netdev_get_by_family(int family)
...
@@ -281,8 +280,7 @@ struct netdev *netdev_get_by_family(int family)
{
{
netdev
=
rt_slist_entry
(
node
,
struct
netdev
,
list
);
netdev
=
rt_slist_entry
(
node
,
struct
netdev
,
list
);
pf
=
(
struct
sal_proto_family
*
)
netdev
->
sal_user_data
;
pf
=
(
struct
sal_proto_family
*
)
netdev
->
sal_user_data
;
if
(
pf
&&
pf
->
skt_ops
&&
pf
->
sec_family
==
family
&&
if
(
pf
&&
pf
->
skt_ops
&&
pf
->
sec_family
==
family
&&
netdev_is_up
(
netdev
))
netdev_is_up
(
netdev
)
&&
netdev_is_link_up
(
netdev
))
{
{
rt_hw_interrupt_enable
(
level
);
rt_hw_interrupt_enable
(
level
);
return
netdev
;
return
netdev
;
...
...
components/net/sal_socket/src/sal_socket.c
浏览文件 @
2721e718
...
@@ -388,17 +388,14 @@ static int socket_init(int family, int type, int protocol, struct sal_socket **r
...
@@ -388,17 +388,14 @@ static int socket_init(int family, int type, int protocol, struct sal_socket **r
sock
->
protocol
=
protocol
;
sock
->
protocol
=
protocol
;
/* get socket operations from network interface device */
/* get socket operations from network interface device */
if
(
netdv_def
)
if
(
netdv_def
&&
netdev_is_up
(
netdv_def
)
)
{
{
if
(
netdev_is_up
(
netdv_def
)
&&
netdev_is_link_up
(
netdv_def
))
/* check default network interface device protocol family */
pf
=
(
struct
sal_proto_family
*
)
netdv_def
->
sal_user_data
;
if
(
pf
!=
RT_NULL
&&
pf
->
skt_ops
&&
(
pf
->
family
==
family
||
pf
->
sec_family
==
family
))
{
{
/* check default network interface device protocol family */
sock
->
netdev
=
netdv_def
;
pf
=
(
struct
sal_proto_family
*
)
netdv_def
->
sal_user_data
;
falgs
=
RT_TRUE
;
if
(
pf
!=
RT_NULL
&&
pf
->
skt_ops
&&
(
pf
->
family
==
family
||
pf
->
sec_family
==
family
))
{
sock
->
netdev
=
netdv_def
;
falgs
=
RT_TRUE
;
}
}
}
}
}
else
else
...
@@ -516,8 +513,6 @@ int sal_accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
...
@@ -516,8 +513,6 @@ int sal_accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
/* get the socket object by socket descriptor */
/* get the socket object by socket descriptor */
SAL_SOCKET_OBJ_GET
(
sock
,
socket
);
SAL_SOCKET_OBJ_GET
(
sock
,
socket
);
/* check the network interface is commonicable */
SAL_NETDEV_IS_COMMONICABLE
(
sock
->
netdev
);
/* check the network interface socket operations */
/* check the network interface socket operations */
SAL_NETDEV_SOCKETOPS_VALID
(
sock
->
netdev
,
pf
,
accept
);
SAL_NETDEV_SOCKETOPS_VALID
(
sock
->
netdev
,
pf
,
accept
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录