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

drivers/net/lan91c111.c: Reuse lan91c111_reply for ARP case

Browse Source
This commit is contained in:
Xiang Xiao 2018-11-09 09:38:59 -06:00 committed by Gregory Nutt
parent cb095ea3d3
commit f65e7a4097
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/net/lan91c111.c
View File

@ -530,18 +530,13 @@ static int lan91c111_txpoll(FAR struct net_driver_s *dev)
*/ */
#ifdef CONFIG_NET_IPv4 #ifdef CONFIG_NET_IPv4
#ifdef CONFIG_NET_IPv6
if (IFF_IS_IPv4(dev->d_flags)) if (IFF_IS_IPv4(dev->d_flags))
#endif
{ {
arp_out(dev); arp_out(dev);
} }
#endif /* CONFIG_NET_IPv4 */ #endif /* CONFIG_NET_IPv4 */
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
#ifdef CONFIG_NET_IPv4 if (IFF_IS_IPv6(dev->d_flags))
else
#endif
{ {
neighbor_out(dev); neighbor_out(dev);
} }
@ -598,22 +593,13 @@ static void lan91c111_reply(FAR struct net_driver_s *dev)
/* Update the Ethernet header with the correct MAC address */ /* Update the Ethernet header with the correct MAC address */
#ifdef CONFIG_NET_IPv4 #ifdef CONFIG_NET_IPv4
#ifdef CONFIG_NET_IPv6
/* Check for an outgoing IPv4 packet */
if (IFF_IS_IPv4(dev->d_flags)) if (IFF_IS_IPv4(dev->d_flags))
#endif
{ {
arp_out(dev); arp_out(dev);
} }
#endif #endif
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
#ifdef CONFIG_NET_IPv4 if (IFF_IS_IPv6(dev->d_flags))
/* Otherwise, it must be an outgoing IPv6 packet */
else
#endif
{ {
neighbor_out(dev); neighbor_out(dev);
} }
@ -752,14 +738,9 @@ static void lan91c111_receive(FAR struct net_driver_s *dev)
arp_arpin(dev); arp_arpin(dev);
/* If the above function invocation resulted in data that should be /* Check for a reply to the ARP packet */
* sent out on the network, the field d_len will set to a value > 0.
*/
if (dev->d_len > 0) lan91c111_reply(dev);
{
lan91c111_transmit(dev);
}
} }
else else
#endif #endif