From patchwork Sat Aug 20 16:46:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 661152 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3sGm363tNFz9sXy for ; Sun, 21 Aug 2016 02:47:30 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753907AbcHTQrC (ORCPT ); Sat, 20 Aug 2016 12:47:02 -0400 Received: from mout.web.de ([217.72.192.78]:58708 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752844AbcHTQrA (ORCPT ); Sat, 20 Aug 2016 12:47:00 -0400 Received: from [192.168.1.3] ([77.181.94.18]) by smtp.web.de (mrweb102) with ESMTPSA (Nemesis) id 0MWj6V-1beHv52GPz-00XrC2; Sat, 20 Aug 2016 18:46:52 +0200 Subject: [PATCH 2/3] hostap: Delete an unnecessary jump label in prism2_ioctl_priv_hostapd() To: linux-wireless@vger.kernel.org, netdev@vger.kernel.org, Jouni Malinen , Kalle Valo References: <566ABCD9.1060404@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <65ed528f-7ec5-a0f2-6219-3e63a78ca0ee@users.sourceforge.net> Date: Sat, 20 Aug 2016 18:46:49 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: X-Provags-ID: V03:K0:5Ib7H/W2jwh0Zh0vdLAS7Ulm/cA/tUoJCmw3OqZilBxVnxST1P2 pJTmVNciB4zPflrmv2NzqtwwKClIY6xAtxzeH/fvnlihxrhdg2aISAmX2Url6hAGeclDnIr L6S/jGrGP58N1QzEC1V1ED9GPxFqb1g8zBbCUyq3IDW3+w5n1nVaOen3LhUiN91OFjZKyq8 /fKp5xPF72y9XaZrf9YGg== X-UI-Out-Filterresults: notjunk:1; V01:K0:o9TNnZgrwZE=:yts2tdTyLDhAgJKxxpQYFS 6Pyb65uLQpyDLX//3gz3PlCMFVvlT0zUFxKAY4enWDcN5B9qcPWsj/p9LAUMKRyJZ7G043Ao7 Fi3wRfAF6mWSKHy68u59orWd3n8DDJqwnK0RqOuAyW0ty73Jd4nByOi7FOvOhUHkjiU25LaMG vuMGzFWS52Fq9e9hCLsXjqGhiy6CANz78Ci5gEEX0I7X6sU4gzSHJ2p0JbzBmnFKgG/BzXZcB HH9AqeBdPnslKmVwcz56m8imYNZAgaHGCgr+HXIh5hEeBtLqvBtS92ryk2SnvPUl9hbd/r6eZ 2sSIiptk3ObURuLcM6FHF3Y0UtI1ma7lr13Mkc3hgxmYoDj3sgXy7a4/9a3eHu3YAy7+WAyMT PJVyphTKWuBeU+Tg9+NYdKAb5DokEBbswWeeVGncDjaVoItB0XD7EwwwCYOj8m33ZG1K8g/0S lsk3QAVhHSRJ7dTwZcxcrGYT9ds2iF8MK5TEZxTvS2f+VZUpdp/vZPUFvPCyj0o0DSlPx335Z swxCtItzX3xsaJG48kT/JXHrdOaVpTkZa1bGJn8ElPaT7s91775hjWThYOk7XQqnUA/I3FSPc 6lg0ifWQDbZhrtUws3W9yP6HeP4gDFV4n3aizHjZqISAFFopQWz2kxOn4/vkxupWzBO77vtU3 vQJn4OVI0lrfma2QEY09s2keUkeVLYuzTCXLXoF9bmr3afguiu/Klza/kofvSmzD04ldFArdp kc75+sPrTxNzFuhWrh9uzprWEadJ+I5pB3Kxcu/gKv0D9RURyzdiUuZY6D+xBNcb1iCEFp42P HoyiDjJ Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Markus Elfring Date: Sat, 20 Aug 2016 18:21:29 +0200 Remove a jump label which is unneeded in this function at the end. Signed-off-by: Markus Elfring --- drivers/net/wireless/intersil/hostap/hostap_ioctl.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/intersil/hostap/hostap_ioctl.c b/drivers/net/wireless/intersil/hostap/hostap_ioctl.c index 4e271f9..5942917 100644 --- a/drivers/net/wireless/intersil/hostap/hostap_ioctl.c +++ b/drivers/net/wireless/intersil/hostap/hostap_ioctl.c @@ -3835,14 +3835,12 @@ static int prism2_ioctl_priv_hostapd(local_info_t *local, struct iw_point *p) } if (ret == 1 || !ap_ioctl) { - if (copy_to_user(p->pointer, param, p->length)) { + if (copy_to_user(p->pointer, param, p->length)) ret = -EFAULT; - goto out; - } else if (ap_ioctl) + else if (ap_ioctl) ret = 0; } - out: kfree(param); return ret; }