OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Another fix from recent PR: mac802154_primitive_free() does not exist. Perhaps ieee802154_primitive_free() is what was intended?

This commit is contained in:
Gregory Nutt 2017-11-03 08:42:21 -06:00
parent 8d485cd345
commit f562bf0fbe
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wireless/ieee802154/mac802154_netdev.c
View File

@ -1076,7 +1076,7 @@ static int macnet_ioctl(FAR struct net_driver_s *dev, int cmd,
/* Try popping an event off the queue */ /* Try popping an event off the queue */
primitive = (FAR struct ieee802154_primitive_s *) primitive = (FAR struct ieee802154_primitive_s *)
sq_remfirst(&priv->primitive_queue); sq_remfirst(&priv->primitive_queue);
/* If there was an event to pop off, copy it into the user /* If there was an event to pop off, copy it into the user
* data and free it from the MAC layer's memory. * data and free it from the MAC layer's memory.
@ -1084,11 +1084,12 @@ static int macnet_ioctl(FAR struct net_driver_s *dev, int cmd,
if (primitive != NULL) if (primitive != NULL)
{ {
memcpy(&netmac->u, primitive, sizeof(struct ieee802154_primitive_s)); memcpy(&netmac->u, primitive,
sizeof(struct ieee802154_primitive_s));
/* Free the notification */ /* Free the event */
mac802154_primitive_free(priv->md_mac, primitive); ieee802154_primitive_free(primitive);
ret = OK; ret = OK;
break; break;
} }