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

This commit is contained in:
Gregory Nutt 2017-07-04 07:21:50 -06:00
commit 59cb2a280b

View File

@ -508,13 +508,15 @@ int ipv6_forward(FAR struct net_driver_s *dev, FAR struct ipv6_hdr_s *ipv6)
ret = ipv6_dev_forward(fwddev, ipv6, iob); ret = ipv6_dev_forward(fwddev, ipv6, iob);
} }
if (ret >= 0) if (ret < 0)
{ {
goto drop;
}
dev->d_len = 0; dev->d_len = 0;
return OK; return OK;
} }
} }
}
else else
#endif /* CONFIG_NETDEV_MULTINIC */ #endif /* CONFIG_NETDEV_MULTINIC */