summaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
authorchenyong <[email protected]>2019-04-27 17:24:58 +0800
committerchenyong <[email protected]>2019-04-27 17:24:58 +0800
commit2721e7189a0a07c7ac576c7015dfc2146246380e (patch)
tree07f6e5c1cf74721e51981ab72985014203780eee /components
parentc0a400ccbee720fc0e9ee904298f09bd07a21382 (diff)
[net][netdev] Fix netdev link_down status, socket create failed issue
Signed-off-by: chenyong <[email protected]>
Diffstat (limited to 'components')
-rw-r--r--components/net/netdev/src/netdev.c6
-rw-r--r--components/net/sal_socket/src/sal_socket.c17
2 files changed, 8 insertions, 15 deletions
diff --git a/components/net/netdev/src/netdev.c b/components/net/netdev/src/netdev.c
index c5b4d0e321..e4a88ca022 100644
--- a/components/net/netdev/src/netdev.c
+++ b/components/net/netdev/src/netdev.c
@@ -269,8 +269,7 @@ struct netdev *netdev_get_by_family(int family)
{
netdev = rt_slist_entry(node, struct netdev, list);
pf = (struct sal_proto_family *) netdev->sal_user_data;
- if (pf && pf->skt_ops && pf->family == family &&
- netdev_is_up(netdev) && netdev_is_link_up(netdev))
+ if (pf && pf->skt_ops && pf->family == family && netdev_is_up(netdev))
{
rt_hw_interrupt_enable(level);
return netdev;
@@ -281,8 +280,7 @@ struct netdev *netdev_get_by_family(int family)
{
netdev = rt_slist_entry(node, struct netdev, list);
pf = (struct sal_proto_family *) netdev->sal_user_data;
- if (pf && pf->skt_ops && pf->sec_family == family &&
- netdev_is_up(netdev) && netdev_is_link_up(netdev))
+ if (pf && pf->skt_ops && pf->sec_family == family && netdev_is_up(netdev))
{
rt_hw_interrupt_enable(level);
return netdev;
diff --git a/components/net/sal_socket/src/sal_socket.c b/components/net/sal_socket/src/sal_socket.c
index f4d5549aad..4117ab51e7 100644
--- a/components/net/sal_socket/src/sal_socket.c
+++ b/components/net/sal_socket/src/sal_socket.c
@@ -388,17 +388,14 @@ static int socket_init(int family, int type, int protocol, struct sal_socket **r
sock->protocol = protocol;
/* 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 */
- pf = (struct sal_proto_family *) netdv_def->sal_user_data;
- if (pf != RT_NULL && pf->skt_ops && (pf->family == family || pf->sec_family == family))
- {
- sock->netdev = netdv_def;
- falgs = RT_TRUE;
- }
+ sock->netdev = netdv_def;
+ falgs = RT_TRUE;
}
}
else
@@ -516,8 +513,6 @@ int sal_accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
/* get the socket object by socket descriptor */
SAL_SOCKET_OBJ_GET(sock, socket);
- /* check the network interface is commonicable */
- SAL_NETDEV_IS_COMMONICABLE(sock->netdev);
/* check the network interface socket operations */
SAL_NETDEV_SOCKETOPS_VALID(sock->netdev, pf, accept);