]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
staging: wilc1000: fix to set correct value for 'vif_num'
authorAjay Singh <ajay.kathat@microchip.com>
Thu, 7 Feb 2019 11:28:58 +0000 (11:28 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 13 Mar 2019 21:03:07 +0000 (14:03 -0700)
commit dda037057a572f5c82ac2499eb4e6fb17600ba3e upstream.

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: <stable@vger.kernel.org>
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/linux_wlan.c

index 119f3459b5bbf3f49c41179053d87fa36f1780d4..2fc6426c3819ad74caba2a848c1f378154d67920 100644 (file)
@@ -1238,8 +1238,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;