From mboxrd@z Thu Jan 1 00:00:00 1970 From: Colin King 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 Message-ID: <20180613060410.735-2-colin.king@canonical.com> References: <20180613060410.735-1-colin.king@canonical.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org To: "David S . Miller" , netdev@vger.kernel.org Return-path: In-Reply-To: <20180613060410.735-1-colin.king@canonical.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org From: Colin Ian King 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 --- 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