nuttx/nuttx-mirror
1
2
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-01-13 12:08:36 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into usbhub

Browse source
This commit is contained in:
Gregory Nutt 2015-04-27 12:27:43 -06:00
commit 6e20a466ac
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/usbhost/usbhost_storage.c
View file

@ -1632,7 +1632,7 @@ static FAR struct usbmsc_cbw_s *usbhost_cbwalloc(FAR struct usbhost_state_s *pri
{
FAR struct usbmsc_cbw_s *cbw = NULL;
DEBUGASSERT(priv->tbuffer && priv->tbuflen >= sizeof(struct usbmsc_cbw_s))
DEBUGASSERT(priv->tbuffer && priv->tbuflen >= sizeof(struct usbmsc_cbw_s));
/* Initialize the CBW sructure */

2
net/socket/recvfrom.c
View file

@ -960,7 +960,6 @@ static inline void recvfrom_udpsender(struct net_driver_s *dev, struct recvfrom_
{
FAR struct sockaddr_in *infrom =
(FAR struct sockaddr_in *)pstate->rf_from;
FAR socklen_t *fromlen = pstate->rf_fromlen;
if (infrom)
{
@ -977,6 +976,7 @@ static inline void recvfrom_udpsender(struct net_driver_s *dev, struct recvfrom_
if (conn->domain == PF_INET6)
{
FAR socklen_t *fromlen = pstate->rf_fromlen;
in_addr_t ipv4addr;
/* Encode the IPv4 address as an IPv4-mapped IPv6 address */