From 71e1056e6d3457e03241aa70d848c0146609c53b Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Fri, 9 Nov 2018 16:05:11 -0600 Subject: [PATCH] net/icmpv6, neighbor, and netdev: Rename netdev_dev_lladdrsize() to netdev_lladdrsize() and move the prototype to include/nuttx/nex/netdev.h, giving is global scope within the OS. Reviewer: This degrades the integrity of the modular architecture by introducing a new coupling via C function call. Not a good thing at all. --- include/nuttx/net/netdev.h | 16 ++++++++++++++++ net/icmpv6/icmpv6_advertise.c | 2 +- net/icmpv6/icmpv6_linkipaddr.c | 2 +- net/icmpv6/icmpv6_radvertise.c | 2 +- net/icmpv6/icmpv6_rsolicit.c | 2 +- net/icmpv6/icmpv6_solicit.c | 2 +- net/neighbor/neighbor_add.c | 2 +- net/neighbor/neighbor_lookup.c | 2 +- net/netdev/netdev.h | 16 ---------------- net/netdev/netdev_lladdrsize.c | 4 ++-- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/include/nuttx/net/netdev.h b/include/nuttx/net/netdev.h index 6393f7cabde30..fc3728daf9c69 100644 --- a/include/nuttx/net/netdev.h +++ b/include/nuttx/net/netdev.h @@ -744,4 +744,20 @@ uint16_t ipv6_chksum(FAR struct net_driver_s *dev); # define netdev_ipv6_hdrlen(dev) dev->d_llhdrlen #endif /* CONFIG_NET_IPv6 */ +/**************************************************************************** + * Name: netdev_lladdrsize + * + * Description: + * Returns the size of the MAC address associated with a network device. + * + * Input Parameters: + * dev - A reference to the device of interest + * + * Returned Value: + * The size of the MAC address associated with this device + * + ****************************************************************************/ + +int netdev_lladdrsize(FAR struct net_driver_s *dev); + #endif /* __INCLUDE_NUTTX_NET_NETDEV_H */ diff --git a/net/icmpv6/icmpv6_advertise.c b/net/icmpv6/icmpv6_advertise.c index 796a859482f96..03daf006b36bb 100644 --- a/net/icmpv6/icmpv6_advertise.c +++ b/net/icmpv6/icmpv6_advertise.c @@ -107,7 +107,7 @@ void icmpv6_advertise(FAR struct net_driver_s *dev, /* Length excludes the IPv6 header */ - lladdrsize = netdev_dev_lladdrsize(dev); + lladdrsize = netdev_lladdrsize(dev); l3size = SIZEOF_ICMPV6_NEIGHBOR_ADVERTISE_S(lladdrsize); ipv6->len[0] = (l3size >> 8); ipv6->len[1] = (l3size & 0xff); diff --git a/net/icmpv6/icmpv6_linkipaddr.c b/net/icmpv6/icmpv6_linkipaddr.c index f3e4cb84c9c66..f5510bc9c60fb 100644 --- a/net/icmpv6/icmpv6_linkipaddr.c +++ b/net/icmpv6/icmpv6_linkipaddr.c @@ -153,7 +153,7 @@ icmpv6_linkipaddr_8(FAR const void *mac_, net_ipv6addr_t ipaddr) void icmpv6_linkipaddr(FAR struct net_driver_s *dev, net_ipv6addr_t ipaddr) { - switch (netdev_dev_lladdrsize(dev)) + switch (netdev_lladdrsize(dev)) { case 1: icmpv6_linkipaddr_1(&dev->d_mac, ipaddr); diff --git a/net/icmpv6/icmpv6_radvertise.c b/net/icmpv6/icmpv6_radvertise.c index e650298f2c71a..2f0201aabf320 100644 --- a/net/icmpv6/icmpv6_radvertise.c +++ b/net/icmpv6/icmpv6_radvertise.c @@ -160,7 +160,7 @@ void icmpv6_radvertise(FAR struct net_driver_s *dev) /* Length excludes the IPv6 header */ - lladdrsize = netdev_dev_lladdrsize(dev); + lladdrsize = netdev_lladdrsize(dev); l3size = sizeof(struct icmpv6_router_advertise_s) + SIZEOF_ICMPV6_SRCLLADDR_S(lladdrsize) + sizeof(struct icmpv6_mtu_s) + diff --git a/net/icmpv6/icmpv6_rsolicit.c b/net/icmpv6/icmpv6_rsolicit.c index 1b63548ed2c58..1fe00c6bb39bb 100644 --- a/net/icmpv6/icmpv6_rsolicit.c +++ b/net/icmpv6/icmpv6_rsolicit.c @@ -103,7 +103,7 @@ void icmpv6_rsolicit(FAR struct net_driver_s *dev) /* Length excludes the IPv6 header */ - lladdrsize = netdev_dev_lladdrsize(dev); + lladdrsize = netdev_lladdrsize(dev); l3size = SIZEOF_ICMPV6_ROUTER_SOLICIT_S(lladdrsize); ipv6->len[0] = (l3size >> 8); ipv6->len[1] = (l3size & 0xff); diff --git a/net/icmpv6/icmpv6_solicit.c b/net/icmpv6/icmpv6_solicit.c index 754d5bbce0769..94fc95eb55d6e 100644 --- a/net/icmpv6/icmpv6_solicit.c +++ b/net/icmpv6/icmpv6_solicit.c @@ -114,7 +114,7 @@ void icmpv6_solicit(FAR struct net_driver_s *dev, /* Length excludes the IPv6 header */ - lladdrsize = netdev_dev_lladdrsize(dev); + lladdrsize = netdev_lladdrsize(dev); l3size = SIZEOF_ICMPV6_NEIGHBOR_SOLICIT_S(lladdrsize); ipv6->len[0] = (l3size >> 8); ipv6->len[1] = (l3size & 0xff); diff --git a/net/neighbor/neighbor_add.c b/net/neighbor/neighbor_add.c index efa19ab40ef36..f242ec71233d6 100644 --- a/net/neighbor/neighbor_add.c +++ b/net/neighbor/neighbor_add.c @@ -117,7 +117,7 @@ void neighbor_add(FAR struct net_driver_s *dev, FAR net_ipv6addr_t ipaddr, net_ipv6addr_copy(g_neighbors[oldest_ndx].ne_ipaddr, ipaddr); g_neighbors[oldest_ndx].ne_addr.na_lltype = lltype; - g_neighbors[oldest_ndx].ne_addr.na_llsize = netdev_dev_lladdrsize(dev); + g_neighbors[oldest_ndx].ne_addr.na_llsize = netdev_lladdrsize(dev); memcpy(&g_neighbors[oldest_ndx].ne_addr.u, addr, g_neighbors[oldest_ndx].ne_addr.na_llsize); diff --git a/net/neighbor/neighbor_lookup.c b/net/neighbor/neighbor_lookup.c index 0e3351c9da2bb..6330b71ac504d 100644 --- a/net/neighbor/neighbor_lookup.c +++ b/net/neighbor/neighbor_lookup.c @@ -96,7 +96,7 @@ static int neighbor_match(FAR struct net_driver_s *dev, FAR void *arg) if (info->ni_laddr != NULL) { info->ni_laddr->na_lltype = dev->d_lltype; - info->ni_laddr->na_llsize = netdev_dev_lladdrsize(dev); + info->ni_laddr->na_llsize = netdev_lladdrsize(dev); memcpy(&info->ni_laddr->u, &dev->d_mac, info->ni_laddr->na_llsize); } diff --git a/net/netdev/netdev.h b/net/netdev/netdev.h index d79e3f3a05ffa..386c058434c1c 100644 --- a/net/netdev/netdev.h +++ b/net/netdev/netdev.h @@ -499,22 +499,6 @@ struct lifconf; /* Forward reference */ int netdev_ipv6_ifconf(FAR struct lifconf *lifc); #endif -/**************************************************************************** - * Name: netdev_dev_lladdrsize - * - * Description: - * Returns the size of the MAC address associated with a network device. - * - * Input Parameters: - * dev - A reference to the device of interest - * - * Returned Value: - * The size of the MAC address associated with this device - * - ****************************************************************************/ - -int netdev_dev_lladdrsize(FAR struct net_driver_s *dev); - /**************************************************************************** * Name: netdown_notifier_setup * diff --git a/net/netdev/netdev_lladdrsize.c b/net/netdev/netdev_lladdrsize.c index ec03f5089f2ed..a3abc366d0ef0 100644 --- a/net/netdev/netdev_lladdrsize.c +++ b/net/netdev/netdev_lladdrsize.c @@ -98,7 +98,7 @@ static inline int netdev_pktradio_addrlen(FAR struct net_driver_s *dev) ****************************************************************************/ /**************************************************************************** - * Name: netdev_dev_lladdrsize + * Name: netdev_lladdrsize * * Description: * Returns the size of the MAC address associated with a network device. @@ -111,7 +111,7 @@ static inline int netdev_pktradio_addrlen(FAR struct net_driver_s *dev) * ****************************************************************************/ -int netdev_dev_lladdrsize(FAR struct net_driver_s *dev) +int netdev_lladdrsize(FAR struct net_driver_s *dev) { DEBUGASSERT(dev != NULL);