This patches removes duplicate wilc variable setting.
This value has already been set to wl variable previously.
Replace wilc with wl as well.

Signed-off-by: Leo Kim <leo....@atmel.com>
---
 drivers/staging/wilc1000/linux_wlan.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/wilc1000/linux_wlan.c 
b/drivers/staging/wilc1000/linux_wlan.c
index 8a10831..1a5de2e 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -896,7 +896,6 @@ static int mac_init_fn(struct net_device *ndev)
 int wilc_mac_open(struct net_device *ndev)
 {
        struct wilc_vif *vif;
-       struct wilc *wilc;
 
        unsigned char mac_add[ETH_ALEN] = {0};
        int ret = 0;
@@ -912,7 +911,6 @@ int wilc_mac_open(struct net_device *ndev)
                return -ENODEV;
        }
 
-       wilc = vif->wilc;
        priv = wiphy_priv(vif->ndev->ieee80211_ptr->wiphy);
        netdev_dbg(ndev, "MAC OPEN[%p]\n", ndev);
 
@@ -932,13 +930,13 @@ int wilc_mac_open(struct net_device *ndev)
                                wilc_set_wfi_drv_handler(vif,
                                                         wilc_get_vif_idx(vif),
                                                         0);
-                       } else if (!wilc_wlan_get_num_conn_ifcs(wilc)) {
+                       } else if (!wilc_wlan_get_num_conn_ifcs(wl)) {
                                wilc_set_wfi_drv_handler(vif,
                                                         wilc_get_vif_idx(vif),
-                                                        wilc->open_ifcs);
+                                                        wl->open_ifcs);
                        } else {
-                               if (memcmp(wilc->vif[i ^ 1]->bssid,
-                                          wilc->vif[i ^ 1]->src_addr, 6))
+                               if (memcmp(wl->vif[i ^ 1]->bssid,
+                                          wl->vif[i ^ 1]->src_addr, 6))
                                        wilc_set_wfi_drv_handler(vif,
                                                         wilc_get_vif_idx(vif),
                                                         0);
-- 
1.9.1

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to