From: Colin King <colin.king@canonical.com>
To: "David S . Miller" <davem@davemloft.net>, netdev@vger.kernel.org
Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] WAN: LMC: ensure lmc_trace is reporting return from lmc_proto_type
Date: Wed, 13 Jun 2018 07:04:10 +0100 [thread overview]
Message-ID: <20180613060410.735-2-colin.king@canonical.com> (raw)
In-Reply-To: <20180613060410.735-1-colin.king@canonical.com>
From: Colin Ian King <colin.king@canonical.com>
Currently the lmc tracing is not reporting the return from function
lmc_proto_type and this tracing statement is never executed. Fix
this by returning through the end of the function. Also fix a typo
in the function name lmc_proto_type in the trace message.
Detected by CoverityScan, CID#710539 ("Structurally dead code")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/net/wan/lmc/lmc_proto.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wan/lmc/lmc_proto.c b/drivers/net/wan/lmc/lmc_proto.c
index 5a6c87bce1bf..b98c1ee860de 100644
--- a/drivers/net/wan/lmc/lmc_proto.c
+++ b/drivers/net/wan/lmc/lmc_proto.c
@@ -99,23 +99,27 @@ void lmc_proto_close(lmc_softc_t *sc)
__be16 lmc_proto_type(lmc_softc_t *sc, struct sk_buff *skb) /*FOLD00*/
{
+ __be16 ret;
+
lmc_trace(sc->lmc_device, "lmc_proto_type in");
switch (sc->if_type) {
case LMC_PPP:
- return hdlc_type_trans(skb, sc->lmc_device);
+ ret = hdlc_type_trans(skb, sc->lmc_device);
break;
case LMC_NET:
- return htons(ETH_P_802_2);
+ ret = htons(ETH_P_802_2);
break;
case LMC_RAW: /* Packet type for skbuff kind of useless */
- return htons(ETH_P_802_2);
+ ret = htons(ETH_P_802_2);
break;
default:
printk(KERN_WARNING "%s: No protocol set for this interface, assuming 802.2 (which is wrong!!)\n", sc->name);
- return htons(ETH_P_802_2);
+ ret = htons(ETH_P_802_2);
break;
}
- lmc_trace(sc->lmc_device, "lmc_proto_tye out");
+ lmc_trace(sc->lmc_device, "lmc_proto_type out");
+
+ return ret;
}
void lmc_proto_netif(lmc_softc_t *sc, struct sk_buff *skb) /*FOLD00*/
--
2.17.0
next prev parent reply other threads:[~2018-06-13 6:04 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-13 6:04 [PATCH 1/2] WAN: LMC: fix up indentations with tabs Colin King
2018-06-13 6:04 ` Colin King [this message]
2018-06-13 9:22 ` [PATCH 2/2] WAN: LMC: ensure lmc_trace is reporting return from lmc_proto_type Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180613060410.735-2-colin.king@canonical.com \
--to=colin.king@canonical.com \
--cc=davem@davemloft.net \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).