[PATCH 4.4 24/73] net: caif: fix misleading indentation

From: Greg Kroah-Hartman
Date: Wed Sep 28 2016 - 05:25:14 EST

4.4-stable review patch. If anyone has any objections, please let me know.


From: Arnd Bergmann <arnd@xxxxxxxx>

commit 8e0cc8c326d99e41468c96fea9785ab78883a281 upstream.

gcc points out code that is not indented the way it is

net/caif/cfpkt_skbuff.c: In function 'cfpkt_setlen':
net/caif/cfpkt_skbuff.c:289:4: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation]
return cfpkt_getlen(pkt);
net/caif/cfpkt_skbuff.c:286:3: note: ...this 'else' clause, but it is not

It is clear from the context that not returning here would be
a bug, as we'd end up passing a negative length into a function
that takes a u16 length, so it is not missing curly braces
here, and I'm assuming that the indentation is the only part
that's wrong about it.

Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

net/caif/cfpkt_skbuff.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/net/caif/cfpkt_skbuff.c
+++ b/net/caif/cfpkt_skbuff.c
@@ -286,7 +286,7 @@ int cfpkt_setlen(struct cfpkt *pkt, u16
skb_trim(skb, len);

- return cfpkt_getlen(pkt);
+ return cfpkt_getlen(pkt);

/* Need to expand SKB */