This is a note to let you know that I've just added the patch titled
caif: Add missing braces to multiline if in cfctrl_linkup_request
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
caif-add-missing-braces-to-multiline-if-in-cfctrl_linkup_request.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From dd2b73f2e768a8367f75609f28832eaee2e6bba8 Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@xxxxxxxxxx>
Date: Thu, 5 Sep 2013 00:11:19 -0400
Subject: caif: Add missing braces to multiline if in cfctrl_linkup_request
From: Dave Jones <davej@xxxxxxxxxx>
[ Upstream commit 0c1db731bfcf3a9fd6c58132134f8b0f423552f0 ]
The indentation here implies this was meant to be a multi-line if.
Introduced several years back in commit c85c2951d4da1236e32f1858db418221e624aba5
("caif: Handle dev_queue_xmit errors.")
Signed-off-by: Dave Jones <davej@xxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/caif/cfctrl.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/net/caif/cfctrl.c
+++ b/net/caif/cfctrl.c
@@ -293,9 +293,10 @@ int cfctrl_linkup_request(struct cflayer
count = cfctrl_cancel_req(&cfctrl->serv.layer,
user_layer);
- if (count != 1)
+ if (count != 1) {
pr_err("Could not remove request (%d)", count);
return -ENODEV;
+ }
}
return 0;
}
Patches currently in stable-queue which might be from davej@xxxxxxxxxx are
queue-3.10/tcp-add-missing-braces-to-do_tcp_setsockopt.patch
queue-3.10/caif-add-missing-braces-to-multiline-if-in-cfctrl_linkup_request.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html