diff --git a/arch/arm/src/c5471/c5471_ethernet.c b/arch/arm/src/c5471/c5471_ethernet.c index 13a7549516a..2bb5a794417 100644 --- a/arch/arm/src/c5471/c5471_ethernet.c +++ b/arch/arm/src/c5471/c5471_ethernet.c @@ -1046,7 +1046,7 @@ static int c5471_txpoll(struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&priv->c_dev)) + if (!devif_loopback(&priv->c_dev)) { /* Send the packet */ diff --git a/arch/arm/src/imxrt/imxrt_enet.c b/arch/arm/src/imxrt/imxrt_enet.c index 73b88f105f5..933c208bba4 100644 --- a/arch/arm/src/imxrt/imxrt_enet.c +++ b/arch/arm/src/imxrt/imxrt_enet.c @@ -600,7 +600,7 @@ static int imxrt_txpoll(struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&priv->dev)) + if (!devif_loopback(&priv->dev)) { /* Send the packet */ diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c index c73d7f76e04..de9812d7760 100644 --- a/arch/arm/src/kinetis/kinetis_enet.c +++ b/arch/arm/src/kinetis/kinetis_enet.c @@ -571,7 +571,7 @@ static int kinetis_txpoll(struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&priv->dev)) + if (!devif_loopback(&priv->dev)) { /* Send the packet */ diff --git a/arch/arm/src/lpc17xx/lpc17_ethernet.c b/arch/arm/src/lpc17xx/lpc17_ethernet.c index 5205a474160..36af6874077 100644 --- a/arch/arm/src/lpc17xx/lpc17_ethernet.c +++ b/arch/arm/src/lpc17xx/lpc17_ethernet.c @@ -716,7 +716,7 @@ static int lpc17_txpoll(struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&priv->lp_dev)) + if (!devif_loopback(&priv->lp_dev)) { /* Send this packet. In this context, we know that there is space for * at least one more packet in the descriptor list. diff --git a/arch/arm/src/lpc43xx/lpc43_ethernet.c b/arch/arm/src/lpc43xx/lpc43_ethernet.c index 83868772761..69473f03bca 100644 --- a/arch/arm/src/lpc43xx/lpc43_ethernet.c +++ b/arch/arm/src/lpc43xx/lpc43_ethernet.c @@ -1165,7 +1165,7 @@ static int lpc43_txpoll(struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&priv->dev)) + if (!devif_loopback(&priv->dev)) { /* Send the packet */ diff --git a/arch/arm/src/lpc54xx/lpc54_ethernet.c b/arch/arm/src/lpc54xx/lpc54_ethernet.c index 33f6553e726..3d234feb353 100644 --- a/arch/arm/src/lpc54xx/lpc54_ethernet.c +++ b/arch/arm/src/lpc54xx/lpc54_ethernet.c @@ -790,7 +790,7 @@ static int lpc54_eth_txpoll(struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&priv->eth_dev)) + if (!devif_loopback(&priv->eth_dev)) { /* Send the packet */ diff --git a/arch/arm/src/sam34/sam_emac.c b/arch/arm/src/sam34/sam_emac.c index 02e4319a277..deecb373686 100644 --- a/arch/arm/src/sam34/sam_emac.c +++ b/arch/arm/src/sam34/sam_emac.c @@ -889,7 +889,7 @@ static int sam_txpoll(struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&priv->dev)) + if (!devif_loopback(&priv->dev)) { /* Send the packet */ diff --git a/arch/arm/src/sama5/sam_emaca.c b/arch/arm/src/sama5/sam_emaca.c index 6c090382cac..f8f88f84e01 100644 --- a/arch/arm/src/sama5/sam_emaca.c +++ b/arch/arm/src/sama5/sam_emaca.c @@ -898,7 +898,7 @@ static int sam_txpoll(struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&priv->dev)) + if (!devif_loopback(&priv->dev)) { /* Send the packet */ diff --git a/arch/arm/src/sama5/sam_emacb.c b/arch/arm/src/sama5/sam_emacb.c index b6d74855bb6..8a4298d1f49 100644 --- a/arch/arm/src/sama5/sam_emacb.c +++ b/arch/arm/src/sama5/sam_emacb.c @@ -1233,7 +1233,7 @@ static int sam_txpoll(struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&priv->dev)) + if (!devif_loopback(&priv->dev)) { /* Send the packet */ diff --git a/arch/arm/src/sama5/sam_gmac.c b/arch/arm/src/sama5/sam_gmac.c index 99c664ae9f7..126941ef7b6 100644 --- a/arch/arm/src/sama5/sam_gmac.c +++ b/arch/arm/src/sama5/sam_gmac.c @@ -830,7 +830,7 @@ static int sam_txpoll(struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&priv->dev)) + if (!devif_loopback(&priv->dev)) { /* Send the packet */ diff --git a/arch/arm/src/samv7/sam_emac.c b/arch/arm/src/samv7/sam_emac.c index a32d33f6436..9e238837cf9 100644 --- a/arch/arm/src/samv7/sam_emac.c +++ b/arch/arm/src/samv7/sam_emac.c @@ -1547,7 +1547,7 @@ static int sam_txpoll(struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&priv->dev)) + if (!devif_loopback(&priv->dev)) { /* Send the packet */ diff --git a/arch/arm/src/stm32/stm32_eth.c b/arch/arm/src/stm32/stm32_eth.c index 99b194af8bc..7082ee7b0ee 100644 --- a/arch/arm/src/stm32/stm32_eth.c +++ b/arch/arm/src/stm32/stm32_eth.c @@ -1271,7 +1271,7 @@ static int stm32_txpoll(struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&priv->dev)) + if (!devif_loopback(&priv->dev)) { /* Send the packet */ diff --git a/arch/arm/src/stm32f7/stm32_ethernet.c b/arch/arm/src/stm32f7/stm32_ethernet.c index c80bf4d1eaf..d4521b05817 100644 --- a/arch/arm/src/stm32f7/stm32_ethernet.c +++ b/arch/arm/src/stm32f7/stm32_ethernet.c @@ -1305,7 +1305,7 @@ static int stm32_txpoll(struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&priv->dev)) + if (!devif_loopback(&priv->dev)) { /* Send the packet */ diff --git a/arch/arm/src/tiva/lm3s_ethernet.c b/arch/arm/src/tiva/lm3s_ethernet.c index 460ae9380cf..61500cfc78a 100644 --- a/arch/arm/src/tiva/lm3s_ethernet.c +++ b/arch/arm/src/tiva/lm3s_ethernet.c @@ -644,7 +644,7 @@ static int tiva_txpoll(struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&priv->ld_dev)) + if (!devif_loopback(&priv->ld_dev)) { /* Send the packet. tiva_transmit() will return zero if the * packet was successfully handled. diff --git a/arch/arm/src/tiva/tm4c_ethernet.c b/arch/arm/src/tiva/tm4c_ethernet.c index f8765b5f19d..fa1a8df15d6 100644 --- a/arch/arm/src/tiva/tm4c_ethernet.c +++ b/arch/arm/src/tiva/tm4c_ethernet.c @@ -1273,7 +1273,7 @@ static int tiva_txpoll(struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&priv->dev)) + if (!devif_loopback(&priv->dev)) { /* Send the packet */ diff --git a/arch/hc/src/m9s12/m9s12_ethernet.c b/arch/hc/src/m9s12/m9s12_ethernet.c index c44da32764d..94be21f88f8 100644 --- a/arch/hc/src/m9s12/m9s12_ethernet.c +++ b/arch/hc/src/m9s12/m9s12_ethernet.c @@ -244,7 +244,7 @@ static int emac_txpoll(struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&priv->d_dev)) + if (!devif_loopback(&priv->d_dev)) { /* Send the packet */ diff --git a/arch/mips/src/pic32mx/pic32mx-ethernet.c b/arch/mips/src/pic32mx/pic32mx-ethernet.c index 8618591ba2e..a2444d22f1c 100644 --- a/arch/mips/src/pic32mx/pic32mx-ethernet.c +++ b/arch/mips/src/pic32mx/pic32mx-ethernet.c @@ -1149,7 +1149,7 @@ static int pic32mx_txpoll(struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&priv->pd_dev)) + if (!devif_loopback(&priv->pd_dev)) { /* Send this packet. In this context, we know that there is space for * at least one more packet in the descriptor list. diff --git a/arch/mips/src/pic32mz/pic32mz-ethernet.c b/arch/mips/src/pic32mz/pic32mz-ethernet.c index 95e8117460d..9a23c4fc8ef 100644 --- a/arch/mips/src/pic32mz/pic32mz-ethernet.c +++ b/arch/mips/src/pic32mz/pic32mz-ethernet.c @@ -1176,7 +1176,7 @@ static int pic32mz_txpoll(struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&priv->pd_dev)) + if (!devif_loopback(&priv->pd_dev)) { /* Send this packet. In this context, we know that there is space for * at least one more packet in the descriptor list. diff --git a/arch/misoc/src/common/misoc_net.c b/arch/misoc/src/common/misoc_net.c index 8d80af7f9e4..d5c041bef16 100644 --- a/arch/misoc/src/common/misoc_net.c +++ b/arch/misoc/src/common/misoc_net.c @@ -334,7 +334,7 @@ static int misoc_net_txpoll(FAR struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&priv->misoc_net_dev)) + if (!devif_loopback(&priv->misoc_net_dev)) { /* Send the packet */ diff --git a/arch/sim/src/up_netdriver.c b/arch/sim/src/up_netdriver.c index 29f662447d0..55eb13af8d9 100644 --- a/arch/sim/src/up_netdriver.c +++ b/arch/sim/src/up_netdriver.c @@ -142,7 +142,7 @@ static int sim_txpoll(struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&g_sim_dev)) + if (!devif_loopback(&g_sim_dev)) { /* Send the packet */ diff --git a/arch/z80/src/ez80/ez80_emac.c b/arch/z80/src/ez80/ez80_emac.c index a97d90093f2..58a97b33c96 100644 --- a/arch/z80/src/ez80/ez80_emac.c +++ b/arch/z80/src/ez80/ez80_emac.c @@ -1147,7 +1147,7 @@ static int ez80emac_txpoll(struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&priv->dev)) + if (!devif_loopback(&priv->dev)) { /* Send the packet. ez80emac_transmit() will return zero if the * packet was successfully handled. diff --git a/drivers/net/dm90x0.c b/drivers/net/dm90x0.c index 21cff8a27b2..495c7ada1c9 100644 --- a/drivers/net/dm90x0.c +++ b/drivers/net/dm90x0.c @@ -819,7 +819,7 @@ static int dm9x_txpoll(struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&priv->dm_dev)) + if (!devif_loopback(&priv->dm_dev)) { /* Send the packet */ diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c index 46c1de5aede..f0bc7b1b85c 100644 --- a/drivers/net/enc28j60.c +++ b/drivers/net/enc28j60.c @@ -1213,7 +1213,7 @@ static int enc_txpoll(struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&priv->dev)) + if (!devif_loopback(&priv->dev)) { /* Send the packet */ diff --git a/drivers/net/encx24j600.c b/drivers/net/encx24j600.c index b91fa08c1e8..c6709f4024a 100644 --- a/drivers/net/encx24j600.c +++ b/drivers/net/encx24j600.c @@ -1194,7 +1194,7 @@ static int enc_txpoll(struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&priv->dev)) + if (!devif_loopback(&priv->dev)) { /* Send the packet */ diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index 8608eaf03b2..4b33e68e922 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c @@ -388,7 +388,7 @@ static int ftmac100_txpoll(struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&priv->ft_dev)) + if (!devif_loopback(&priv->ft_dev)) { /* Send the packet */ diff --git a/drivers/net/skeleton.c b/drivers/net/skeleton.c index 55190b882c9..c560499b184 100644 --- a/drivers/net/skeleton.c +++ b/drivers/net/skeleton.c @@ -304,7 +304,7 @@ static int skel_txpoll(FAR struct net_driver_s *dev) * don't attmpt to put it on the wire. */ - if (!devif_loopback_out(&priv->sk_dev)) + if (!devif_loopback(&priv->sk_dev)) { /* Send the packet */ diff --git a/drivers/net/slip.c b/drivers/net/slip.c index 673a7535983..e93c935232e 100644 --- a/drivers/net/slip.c +++ b/drivers/net/slip.c @@ -405,7 +405,7 @@ static int slip_txpoll(FAR struct net_driver_s *dev) if (priv->dev.d_len > 0) { - if (!devif_loopback_out(&priv->dev)) + if (!devif_loopback(&priv->dev)) { slip_transmit(priv); } diff --git a/drivers/usbdev/cdcecm.c b/drivers/usbdev/cdcecm.c index 580c190129c..2d90a1a9c32 100644 --- a/drivers/usbdev/cdcecm.c +++ b/drivers/usbdev/cdcecm.c @@ -400,7 +400,7 @@ static int cdcecm_txpoll(FAR struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&priv->dev)) + if (!devif_loopback(&priv->dev)) { /* Send the packet */ diff --git a/drivers/usbdev/rndis.c b/drivers/usbdev/rndis.c index 30ec8398154..820ff63f237 100644 --- a/drivers/usbdev/rndis.c +++ b/drivers/usbdev/rndis.c @@ -994,7 +994,7 @@ static int rndis_txpoll(FAR struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&priv->netdev)) + if (!devif_loopback(&priv->netdev)) { ret = rndis_transmit(priv); } diff --git a/drivers/wireless/ieee80211/bcmf_netdev.c b/drivers/wireless/ieee80211/bcmf_netdev.c index a6d894fab7d..40967779148 100644 --- a/drivers/wireless/ieee80211/bcmf_netdev.c +++ b/drivers/wireless/ieee80211/bcmf_netdev.c @@ -473,7 +473,7 @@ static int bcmf_txpoll(FAR struct net_driver_s *dev) } #endif /* CONFIG_NET_IPv6 */ - if (!devif_loopback_out(&priv->bc_dev)) + if (!devif_loopback(&priv->bc_dev)) { /* Send the packet */ diff --git a/include/nuttx/net/netdev.h b/include/nuttx/net/netdev.h index 927c00bb659..c7def20c7e1 100644 --- a/include/nuttx/net/netdev.h +++ b/include/nuttx/net/netdev.h @@ -569,7 +569,7 @@ void neighbor_out(FAR struct net_driver_s *dev); #endif /* CONFIG_NET_IPv6 */ /**************************************************************************** - * Name: devif_loopback_out + * Name: devif_loopback * * Description: * This function should be called before sending out a packet. The function @@ -583,7 +583,7 @@ void neighbor_out(FAR struct net_driver_s *dev); * ****************************************************************************/ -int devif_loopback_out(FAR struct net_driver_s *dev); +int devif_loopback(FAR struct net_driver_s *dev); /**************************************************************************** * Carrier detection diff --git a/net/devif/devif_loopbackout.c b/net/devif/devif_loopbackout.c index 63391923905..f76eed1048f 100644 --- a/net/devif/devif_loopbackout.c +++ b/net/devif/devif_loopbackout.c @@ -83,7 +83,7 @@ static bool is_loopback(FAR struct net_driver_s *dev) } /**************************************************************************** - * Name: devif_loopback_out + * Name: devif_loopback * * Description: * This function should be called before sending out a packet. The function @@ -97,7 +97,7 @@ static bool is_loopback(FAR struct net_driver_s *dev) * ****************************************************************************/ -int devif_loopback_out(FAR struct net_driver_s *dev) +int devif_loopback(FAR struct net_driver_s *dev) { if (!is_loopback(dev)) {