Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75E5BC282C2 for ; Thu, 7 Feb 2019 12:35:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3BFF021916 for ; Thu, 7 Feb 2019 12:35:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549542952; bh=2jqgTokPH5wbGfadi0JqXqoQtfvp0VpY+CtLYQ7r7yI=; h=Subject:To:From:Date:List-ID:From; b=nFiMWsp9eW71rxe5OF/3fjWMkruL54dpBvVrh2kqAYgM5G4fHjstZ3Z9E24D7GTio Kzl3osKv2Uf+YVV7dGk5oD3XqFMBDYZVyjgJ8jPdQmD34R6BnzMMCUITroNmiResnU GxFLGUk0SDCyOCUS9tHDgm+XlXwELRKRCwFfoy8M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726949AbfBGMfv (ORCPT ); Thu, 7 Feb 2019 07:35:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:32834 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726789AbfBGMfv (ORCPT ); Thu, 7 Feb 2019 07:35:51 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2419621907; Thu, 7 Feb 2019 12:35:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549542950; bh=2jqgTokPH5wbGfadi0JqXqoQtfvp0VpY+CtLYQ7r7yI=; h=Subject:To:From:Date:From; b=rGwhJ1HQArf0niY96LquY5mMFOAy1sCdCDQwsmCre4rxM5Kbt5c+BZOD2hig+t92l loZYQjjN78ypep4vquzko9rjoSpsDjxOL1FtS+MaFQURgRk0tSCKPdjM4/hF9tCuU3 XStSTLp4IY92mlMuRqyG30oXqaadHp7E+nRUIBg4= Subject: patch "staging: wilc1000: fix to set correct value for 'vif_num'" added to staging-testing To: ajay.kathat@microchip.com, dan.carpenter@oracle.com, gregkh@linuxfoundation.org, stable@vger.kernel.org From: Date: Thu, 07 Feb 2019 13:35:25 +0100 Message-ID: <1549542925231220@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This is a note to let you know that I've just added the patch titled staging: wilc1000: fix to set correct value for 'vif_num' to my staging git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git in the staging-testing branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will be merged to the staging-next branch sometime soon, after it passes testing, and the merge window is open. If you have any questions about this process, please let me know. From dda037057a572f5c82ac2499eb4e6fb17600ba3e Mon Sep 17 00:00:00 2001 From: Ajay Singh Date: Thu, 7 Feb 2019 11:28:58 +0000 Subject: staging: wilc1000: fix to set correct value for 'vif_num' Set correct value in '->vif_num' for the total number of interfaces and set '->idx' value using 'i'. Fixes: 735bb39ca3be ("staging: wilc1000: simplify vif[i]->ndev accesses") Fixes: 0e490657c721 ("staging: wilc1000: Fix problem with wrong vif index") Cc: Suggested-by: Dan Carpenter Signed-off-by: Ajay Singh Reviewed-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wilc1000/linux_wlan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index f096f9e6b274..f3e52af6cc7e 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -1020,8 +1020,8 @@ int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type, vif->wilc = *wilc; vif->ndev = ndev; wl->vif[i] = vif; - wl->vif_num = i; - vif->idx = wl->vif_num; + wl->vif_num = i + 1; + vif->idx = i; ndev->netdev_ops = &wilc_netdev_ops; -- 2.20.1