From patchwork Wed Jun 13 06:04:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 928674 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 415GRk15HTz9s4n for ; Wed, 13 Jun 2018 16:04:34 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754517AbeFMGEO (ORCPT ); Wed, 13 Jun 2018 02:04:14 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:53806 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754463AbeFMGEM (ORCPT ); Wed, 13 Jun 2018 02:04:12 -0400 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1fSyt9-0005JO-3B; Wed, 13 Jun 2018 06:04:11 +0000 From: Colin King To: "David S . Miller" , 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 Message-Id: <20180613060410.735-2-colin.king@canonical.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180613060410.735-1-colin.king@canonical.com> References: <20180613060410.735-1-colin.king@canonical.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: 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*/