From patchwork Fri Mar 18 02:27:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julian Calaby X-Patchwork-Id: 8615871 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C17F7C0553 for ; Fri, 18 Mar 2016 02:27:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E33FD202FE for ; Fri, 18 Mar 2016 02:27:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 12C2320160 for ; Fri, 18 Mar 2016 02:27:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752659AbcCRC1j (ORCPT ); Thu, 17 Mar 2016 22:27:39 -0400 Received: from mail-pf0-f177.google.com ([209.85.192.177]:36739 "EHLO mail-pf0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751361AbcCRC1i (ORCPT ); Thu, 17 Mar 2016 22:27:38 -0400 Received: by mail-pf0-f177.google.com with SMTP id u190so146247286pfb.3 for ; Thu, 17 Mar 2016 19:27:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TLg4D2tl490jxEhZM1iA+70euge1IxZRgtBWwBhRHhE=; b=jcsOio5Ac8Me11Q+4kmb4W6wD6h0puDaEbXcMBcLytR266vmkebsAFXqVN3pVyGEWd yW6prDjnGLX+iZPV8MAX7wEMjLUjLhPd8CXwNAZi4yZU1XEvNwrpStukgmUyBcKmHDNB X8sdJVgX+L4iSBeZzqNtXuTrwAsTJterf0kefWslF33yiN4KKBoD2uT2W58xx/lTBqST LUDXoYb+3HW/FX1zWICmxhcoDi0HJwGMaREaTJ74k7iyJ5lKuYuKRhsMDO1/q5krfdL/ EvE73SaTmK6vXFjiT6xT0FxOwClteujZalItXacwR4yom5Ilu3nZVG0nlfTHT1DF40yq mBOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=TLg4D2tl490jxEhZM1iA+70euge1IxZRgtBWwBhRHhE=; b=N5FGuGYGEiebikrqjT6+wOabV0l8bjNojwEfban6HvusNjzC3INZATsWin///aAnmk +0cjCfXsIUklbg3c94b7pZzujRRARVoEKuufC5fr3nW0qFl+9NUCzcyJTTld2Qe7yyZP I4Xdl6rcS7P5YjZTtVYfl4n/l7QQi6T8V5b35JdZ7NU6UjORM/pkyNvCV1z8da81sn5U SPPY9hBrw9FWYU+toP5iliHInrynfVYPLSZc14SeH664DkvCiRninR0f6z70HhNGKnJg wl4q786w+/CSqz/eSKrZ8UTGgRm8nEdNnClRrqNcEkK7EgyVbSqT0ziICwsfIASkmsEA VtNw== X-Gm-Message-State: AD7BkJKI+GftYqh4cLd2F2eSWCAZuNuzOsmzw9GxgDrMDtyVjZTd1z6s/ZlcyRj0+xPDZw== X-Received: by 10.66.190.168 with SMTP id gr8mr19853261pac.23.1458268057208; Thu, 17 Mar 2016 19:27:37 -0700 (PDT) Received: from multimedia.lan (C-59-101-14-180.hay.connect.net.au. [59.101.14.180]) by smtp.gmail.com with ESMTPSA id by3sm16385269pab.39.2016.03.17.19.27.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 Mar 2016 19:27:36 -0700 (PDT) From: Julian Calaby To: Kalle Valo Cc: Markus Elfring , linux-wireless@vger.kernel.org Subject: [PATCH MOREWORK 15/19] rsi: Move variable initialisation into error code Date: Fri, 18 Mar 2016 13:27:31 +1100 Message-Id: <0a8900fc6af3452d6601c186580381b23e1a3913.1458262312.git.julian.calaby@gmail.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: References: Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring In rsi_send_data_pkt(), it's a little more logical to assign 'status' in the actual error handling code as opposed to at the top of the functon. Signed-off-by: Markus Elfring [Deleted controversial bits, rewrote commit message] Signed-off-by: Julian Calaby --- I'm not fussed if this one goes in or not as the central concept of the patch can be argued both ways. Markus had originally added changes to move the setting of adapter down to just before it was used, however people rightly objected to it, so it's been removed from this re-send and the commit message re-written to reflect this. Thanks, Julian Calaby --- drivers/net/wireless/rsi/rsi_91x_pkt.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/rsi/rsi_91x_pkt.c b/drivers/net/wireless/rsi/rsi_91x_pkt.c index 4322df1..a0b31c0 100644 --- a/drivers/net/wireless/rsi/rsi_91x_pkt.c +++ b/drivers/net/wireless/rsi/rsi_91x_pkt.c @@ -31,7 +31,7 @@ int rsi_send_data_pkt(struct rsi_common *common, struct sk_buff *skb) struct ieee80211_tx_info *info; struct skb_info *tx_params; struct ieee80211_bss_conf *bss; - int status = -EINVAL; + int status; u8 ieee80211_size = MIN_802_11_HDR_LEN; u8 extnd_size; __le16 *frame_desc; @@ -41,8 +41,10 @@ int rsi_send_data_pkt(struct rsi_common *common, struct sk_buff *skb) bss = &info->control.vif->bss_conf; tx_params = (struct skb_info *)info->driver_data; - if (!bss->assoc) + if (!bss->assoc) { + status = -EINVAL; goto err; + } tmp_hdr = (struct ieee80211_hdr *)&skb->data[0]; seq_num = (le16_to_cpu(tmp_hdr->seq_ctrl) >> 4);