Remove CONFIG_NET_MULTILINK. This increases code size by a little, but greatly reduces the complexity of the network code.

This commit is contained in:
Gregory Nutt
2017-08-08 15:26:09 -06:00
parent bd7c84b23e
commit aeb59383cf
33 changed files with 171 additions and 554 deletions
-2
View File
@@ -161,7 +161,6 @@ static uint16_t send_interrupt(FAR struct net_driver_s *dev,
ninfo("flags: %04x: %d\n", flags);
#ifdef CONFIG_NET_MULTILINK
/* Verify that this is a compatible network driver. */
if (dev->d_lltype != NET_LL_IEEE802154 &&
@@ -170,7 +169,6 @@ static uint16_t send_interrupt(FAR struct net_driver_s *dev,
ninfo("Not a compatible network device\n");
return flags;
}
#endif
/* REVISIT: Verify that this is the correct IEEE802.15.4 network driver to
* route the outgoing frame(s). Chances are that there is only one
-4
View File
@@ -350,7 +350,6 @@ static uint16_t tcp_send_interrupt(FAR struct net_driver_s *dev,
struct ipv6tcp_hdr_s ipv6tcp;
int ret;
#ifdef CONFIG_NET_MULTILINK
/* Verify that this is an IEEE802.15.4 network driver. */
if (dev->d_lltype != NET_LL_IEEE802154 &&
@@ -359,7 +358,6 @@ static uint16_t tcp_send_interrupt(FAR struct net_driver_s *dev,
ninfo("Not a compatible network device\n");
return flags;
}
#endif
/* The TCP socket is connected and, hence, should be bound to a device.
* Make sure that the polling device is the one that we are bound to.
@@ -803,7 +801,6 @@ ssize_t psock_6lowpan_tcp_send(FAR struct socket *psock, FAR const void *buf,
return (ssize_t)-ENETUNREACH;
}
#ifdef CONFIG_NET_MULTILINK
/* Some network devices support different link layer protocols.
* Check if this device has the hooks to support 6LoWPAN.
*/
@@ -814,7 +811,6 @@ ssize_t psock_6lowpan_tcp_send(FAR struct socket *psock, FAR const void *buf,
nwarn("WARNING: Not a compatible network device\n");
return (ssize_t)-ENONET;
}
#endif
#ifdef CONFIG_NET_ICMPv6_NEIGHBOR
/* Make sure that the IP address mapping is in the Neighbor Table */
-2
View File
@@ -213,7 +213,6 @@ ssize_t psock_6lowpan_udp_sendto(FAR struct socket *psock,
return (ssize_t)-ENETUNREACH;
}
#ifdef CONFIG_NET_MULTILINK
/* Some network devices support different link layer protocols.
* Check if this device has the hooks to support 6LoWPAN.
*/
@@ -224,7 +223,6 @@ ssize_t psock_6lowpan_udp_sendto(FAR struct socket *psock,
nwarn("WARNING: Not a compatible network device\n");
return (ssize_t)-ENONET;
}
#endif
#ifdef CONFIG_NET_ICMPv6_NEIGHBOR
/* Make sure that the IP address mapping is in the Neighbor Table */