Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gnrc_ndp_internal: add missing unlock when the pktbuf is full (Backport) #4569

Merged

Conversation

cgundogan
Copy link
Member

Backport of #4533 (Thanks to @Yonezawa-T2)

@cgundogan cgundogan added Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) Area: network Area: Networking CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Jan 4, 2016
@cgundogan cgundogan added this to the Release 2015.12 milestone Jan 4, 2016
@miri64
Copy link
Member

miri64 commented Jan 4, 2016

ACK and go, when travis is happy.

@@ -484,6 +485,7 @@ void gnrc_ndp_internal_send_rtr_adv(kernel_pid_t iface, ipv6_addr_t *src, ipv6_a
&ctx->prefix, pkt);
if (hdr == NULL) {
DEBUG("ndp rtr: error allocating 6CO\n");
mutex_unlock(&ipv6_iface->mutex);
gnrc_pktbuf_release(pkt);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the 1st diff'd line the order is gnrc_pktbuf_release then mutex_unlock.
In the latter two lines the order is reversed.
Is this intentional / correct?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

discussed this with @authmillenon. The order should be irrelevant in this case

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, just wanted to make sure. :)

@cgundogan cgundogan force-pushed the pr/gnrc/add_missing_unlock branch 2 times, most recently from 403b2e8 to 348fa68 Compare January 4, 2016 21:34
@cgundogan
Copy link
Member Author

rebased to include the ccn-lite fix for travis

Squashed a commit by Cenk Gündoğan <cnkgndgn@gmail.com>.
@cgundogan cgundogan force-pushed the pr/gnrc/add_missing_unlock branch from 348fa68 to f25235d Compare January 4, 2016 21:58
@cgundogan
Copy link
Member Author

Travis agrees - GO

cgundogan added a commit that referenced this pull request Jan 5, 2016
gnrc_ndp_internal: add missing unlock when the pktbuf is full (Backport)
@cgundogan cgundogan merged commit f319f8b into RIOT-OS:2015.12-branch Jan 5, 2016
@cgundogan cgundogan deleted the pr/gnrc/add_missing_unlock branch January 5, 2016 05:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: network Area: Networking CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants