sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net/devif: add common interface to build L2 headers

Browse Source 
So we can hide the implementation details of L2 NICs.

Signed-off-by: chao an <anchao@xiaomi.com>
This commit is contained in:
chao an 2022-11-28 17:47:44 +08:00 committed by Petro Karashchenko
parent 4800c166ec
commit 615845d9a6
5 changed files with 77 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/arp/arp_poll.c
View File

@ -64,7 +64,7 @@ int arp_poll(FAR struct net_driver_s *dev, devif_poll_callback_t callback)
/* Call back into the driver */ /* Call back into the driver */
return devif_out(dev, callback); return devif_poll_out(dev, callback);
} }
#endif /* CONFIG_NET_ARP_SEND */ #endif /* CONFIG_NET_ARP_SEND */

17
net/devif/devif.h
View File

@ -518,6 +518,20 @@ void devif_can_send(FAR struct net_driver_s *dev, FAR const void *buf,
* Name: devif_out * Name: devif_out
* *
* Description: * Description:
* Common interface to build L2 headers
*
* Assumptions:
* This function is called from the MAC device driver with the network
* locked.
*
****************************************************************************/
void devif_out(FAR struct net_driver_s *dev);
/****************************************************************************
* Name: devif_poll_out
*
* Description:
* Generic callback before device output to build L2 headers before sending * Generic callback before device output to build L2 headers before sending
* *
* Assumptions: * Assumptions:
@ -526,7 +540,8 @@ void devif_can_send(FAR struct net_driver_s *dev, FAR const void *buf,
* *
****************************************************************************/ ****************************************************************************/
int devif_out(FAR struct net_driver_s *dev, devif_poll_callback_t callback); int devif_poll_out(FAR struct net_driver_s *dev,
devif_poll_callback_t callback);
/**************************************************************************** /****************************************************************************
* Name: devif_loopback * Name: devif_loopback

89
net/devif/devif_poll.c
View File

@ -378,7 +378,7 @@ static inline int devif_poll_icmp(FAR struct net_driver_s *dev,
/* Call back into the driver */ /* Call back into the driver */
bstop = devif_out(dev, callback); bstop = devif_poll_out(dev, callback);
} }
} }
@ -425,7 +425,7 @@ static inline int devif_poll_icmpv6(FAR struct net_driver_s *dev,
/* Call back into the driver */ /* Call back into the driver */
bstop = devif_out(dev, callback); bstop = devif_poll_out(dev, callback);
} }
} }
while (!bstop && (conn = icmpv6_nextconn(conn)) != NULL); while (!bstop && (conn = icmpv6_nextconn(conn)) != NULL);
@ -457,7 +457,7 @@ static inline int devif_poll_forward(FAR struct net_driver_s *dev,
/* Call back into the driver */ /* Call back into the driver */
return devif_out(dev, callback); return devif_poll_out(dev, callback);
} }
#endif /* CONFIG_NET_ICMPv6_SOCKET || CONFIG_NET_ICMPv6_NEIGHBOR*/ #endif /* CONFIG_NET_ICMPv6_SOCKET || CONFIG_NET_ICMPv6_NEIGHBOR*/
@ -487,7 +487,7 @@ static inline int devif_poll_igmp(FAR struct net_driver_s *dev,
/* Call back into the driver */ /* Call back into the driver */
return devif_out(dev, callback); return devif_poll_out(dev, callback);
} }
#endif /* CONFIG_NET_IGMP */ #endif /* CONFIG_NET_IGMP */
@ -517,7 +517,7 @@ static inline int devif_poll_mld(FAR struct net_driver_s *dev,
/* Call back into the driver */ /* Call back into the driver */
return devif_out(dev, callback); return devif_poll_out(dev, callback);
} }
#endif /* CONFIG_NET_MLD */ #endif /* CONFIG_NET_MLD */
@ -562,7 +562,7 @@ static int devif_poll_udp_connections(FAR struct net_driver_s *dev,
/* Call back into the driver */ /* Call back into the driver */
bstop = devif_out(dev, callback); bstop = devif_poll_out(dev, callback);
} }
} }
@ -607,7 +607,7 @@ static inline int devif_poll_tcp_connections(FAR struct net_driver_s *dev,
/* Call back into the driver */ /* Call back into the driver */
bstop = devif_out(dev, callback); bstop = devif_poll_out(dev, callback);
} }
} }
@ -776,6 +776,54 @@ int devif_poll(FAR struct net_driver_s *dev, devif_poll_callback_t callback)
* Name: devif_out * Name: devif_out
* *
* Description: * Description:
* Generic interface to build L2 headers
*
* Assumptions:
* This function is called from the MAC device driver with the network
* locked.
*
****************************************************************************/
void devif_out(FAR struct net_driver_s *dev)
{
if (dev->d_len == 0)
{
return;
}
switch (dev->d_lltype)
{
#ifdef CONFIG_NET_ETHERNET
case NET_LL_ETHERNET:
case NET_LL_IEEE80211:
# ifdef CONFIG_NET_IPv4
# ifdef CONFIG_NET_IPv6
if (IFF_IS_IPv4(dev->d_flags))
# endif /* CONFIG_NET_IPv6 */
{
arp_out(dev);
}
# endif /* CONFIG_NET_IPv4 */
# ifdef CONFIG_NET_IPv6
# ifdef CONFIG_NET_IPv4
else
# endif /* CONFIG_NET_IPv4 */
{
neighbor_out(dev);
}
# endif /* CONFIG_NET_IPv6 */
break;
#endif /* CONFIG_NET_ETHERNET */
default:
break;
}
}
/****************************************************************************
* Name: devif_poll_out
*
* Description:
* Generic callback before device output to build L2 headers before sending * Generic callback before device output to build L2 headers before sending
* *
* Assumptions: * Assumptions:
@ -784,7 +832,8 @@ int devif_poll(FAR struct net_driver_s *dev, devif_poll_callback_t callback)
* *
****************************************************************************/ ****************************************************************************/
int devif_out(FAR struct net_driver_s *dev, devif_poll_callback_t callback) int devif_poll_out(FAR struct net_driver_s *dev,
devif_poll_callback_t callback)
{ {
int bstop; int bstop;
@ -799,29 +848,7 @@ int devif_out(FAR struct net_driver_s *dev, devif_poll_callback_t callback)
return bstop; return bstop;
} }
#ifdef CONFIG_NET_ETHERNET devif_out(dev);
if (dev->d_lltype == NET_LL_ETHERNET ||
dev->d_lltype == NET_LL_IEEE80211)
{
# ifdef CONFIG_NET_IPv4
# ifdef CONFIG_NET_IPv6
if (IFF_IS_IPv4(dev->d_flags))
# endif /* CONFIG_NET_IPv6 */
{
arp_out(dev);
}
# endif /* CONFIG_NET_IPv4 */
# ifdef CONFIG_NET_IPv6
# ifdef CONFIG_NET_IPv4
else
# endif /* CONFIG_NET_IPv4 */
{
neighbor_out(dev);
}
# endif /* CONFIG_NET_IPv6 */
}
#endif /* CONFIG_NET_ETHERNET */
return callback(dev); return callback(dev);
} }

5
net/devif/ipv4_input.c
View File

@ -406,10 +406,7 @@ int ipv4_input(FAR struct net_driver_s *dev)
(defined(CONFIG_NET_BROADCAST) && defined(NET_UDP_HAVE_STACK)) (defined(CONFIG_NET_BROADCAST) && defined(NET_UDP_HAVE_STACK))
done: done:
#endif #endif
if (dev->d_len > 0) devif_out(dev);
{
arp_out(dev);
}
/* Return and let the caller do any pending transmission. */ /* Return and let the caller do any pending transmission. */

5
net/devif/ipv6_input.c
View File

@ -508,10 +508,7 @@ int ipv6_input(FAR struct net_driver_s *dev)
#ifdef CONFIG_NET_IPFORWARD #ifdef CONFIG_NET_IPFORWARD
done: done:
#endif #endif
if (dev->d_len > 0) devif_out(dev);
{
neighbor_out(dev);
}
/* Return and let the caller do any pending transmission. */ /* Return and let the caller do any pending transmission. */