From: Ajay Singh ajay.kathat@microchip.com

This patch reverts 0e490657c721 ("staging: wilc1000: Fix problem with wrong vif index") commit.

The issue was not completely fixed with the above commit. After 'for' loop completion, '->idx' value is correct but '->vif_num' still contains incorrect interface count.

Fixes: 0e490657c721 ("staging: wilc1000: Fix problem with wrong vif index") Cc: stable@vger.kernel.org # v4.12 Signed-off-by: Ajay Singh ajay.kathat@microchip.com --- drivers/staging/wilc1000/linux_wlan.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index f096f9e..648b658 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -1017,12 +1017,11 @@ int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type, strcpy(ndev->name, "p2p%d"); vif->ifc_id = 0; } + vif->idx = wl->vif_num; vif->wilc = *wilc; vif->ndev = ndev; wl->vif[i] = vif; wl->vif_num = i; - vif->idx = wl->vif_num; - ndev->netdev_ops = &wilc_netdev_ops;

wdev = wilc_create_wiphy(ndev, dev);