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

net/devif: add common funtion to build L2 headers before sending

Browse Source 
Generic callback before device output to build L2 headers before sending

Signed-off-by: chao an <anchao@xiaomi.com>
This commit is contained in:
chao an 2022-11-26 21:56:26 +08:00 committed by Xiang Xiao
parent 03802dad13
commit db88554d7d
3 changed files with 45 additions and 8 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 callback(dev); return devif_out(dev, callback);
} }
#endif /* CONFIG_NET_ARP_SEND */ #endif /* CONFIG_NET_ARP_SEND */

15
net/devif/devif.h
View File

@ -52,6 +52,7 @@
#include <arch/irq.h> #include <arch/irq.h>
#include <nuttx/net/ip.h> #include <nuttx/net/ip.h>
#include <nuttx/net/netdev.h>
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
@ -513,6 +514,20 @@ void devif_can_send(FAR struct net_driver_s *dev, FAR const void *buf,
unsigned int len); unsigned int len);
#endif #endif
/****************************************************************************
* Name: devif_out
*
* Description:
* Generic callback before device output to build L2 headers before sending
*
* Assumptions:
* This function is called from the MAC device driver with the network
* locked.
*
****************************************************************************/
int devif_out(FAR struct net_driver_s *dev, devif_poll_callback_t callback);
#undef EXTERN #undef EXTERN
#ifdef __cplusplus #ifdef __cplusplus
} }

36
net/devif/devif_poll.c
View File

@ -377,7 +377,7 @@ static inline int devif_poll_icmp(FAR struct net_driver_s *dev,
/* Call back into the driver */ /* Call back into the driver */
bstop = callback(dev); bstop = devif_out(dev, callback);
} }
} }
@ -424,7 +424,7 @@ static inline int devif_poll_icmpv6(FAR struct net_driver_s *dev,
/* Call back into the driver */ /* Call back into the driver */
bstop = callback(dev); bstop = devif_out(dev, callback);
} }
} }
while (!bstop && (conn = icmpv6_nextconn(conn)) != NULL); while (!bstop && (conn = icmpv6_nextconn(conn)) != NULL);
@ -456,7 +456,7 @@ static inline int devif_poll_forward(FAR struct net_driver_s *dev,
/* Call back into the driver */ /* Call back into the driver */
return callback(dev); return devif_out(dev, callback);
} }
#endif /* CONFIG_NET_ICMPv6_SOCKET || CONFIG_NET_ICMPv6_NEIGHBOR*/ #endif /* CONFIG_NET_ICMPv6_SOCKET || CONFIG_NET_ICMPv6_NEIGHBOR*/
@ -486,7 +486,7 @@ static inline int devif_poll_igmp(FAR struct net_driver_s *dev,
/* Call back into the driver */ /* Call back into the driver */
return callback(dev); return devif_out(dev, callback);
} }
#endif /* CONFIG_NET_IGMP */ #endif /* CONFIG_NET_IGMP */
@ -516,7 +516,7 @@ static inline int devif_poll_mld(FAR struct net_driver_s *dev,
/* Call back into the driver */ /* Call back into the driver */
return callback(dev); return devif_out(dev, callback);
} }
#endif /* CONFIG_NET_MLD */ #endif /* CONFIG_NET_MLD */
@ -561,7 +561,7 @@ static int devif_poll_udp_connections(FAR struct net_driver_s *dev,
/* Call back into the driver */ /* Call back into the driver */
bstop = callback(dev); bstop = devif_out(dev, callback);
} }
} }
@ -606,7 +606,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 = callback(dev); bstop = devif_out(dev, callback);
} }
} }
@ -771,4 +771,26 @@ int devif_poll(FAR struct net_driver_s *dev, devif_poll_callback_t callback)
return bstop; return bstop;
} }
/****************************************************************************
* Name: devif_out
*
* Description:
* Generic callback before device output to build L2 headers before sending
*
* Assumptions:
* This function is called from the MAC device driver with the network
* locked.
*
****************************************************************************/
int devif_out(FAR struct net_driver_s *dev, devif_poll_callback_t callback)
{
if (dev->d_len == 0)
{
return 0;
}
return callback(dev);
}
#endif /* CONFIG_NET */ #endif /* CONFIG_NET */