Commit ba750473 authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman

staging: wilc1000: removes duplicate wilc variable setting

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: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2dfad49a
...@@ -896,7 +896,6 @@ static int mac_init_fn(struct net_device *ndev) ...@@ -896,7 +896,6 @@ static int mac_init_fn(struct net_device *ndev)
int wilc_mac_open(struct net_device *ndev) int wilc_mac_open(struct net_device *ndev)
{ {
struct wilc_vif *vif; struct wilc_vif *vif;
struct wilc *wilc;
unsigned char mac_add[ETH_ALEN] = {0}; unsigned char mac_add[ETH_ALEN] = {0};
int ret = 0; int ret = 0;
...@@ -912,7 +911,6 @@ int wilc_mac_open(struct net_device *ndev) ...@@ -912,7 +911,6 @@ int wilc_mac_open(struct net_device *ndev)
return -ENODEV; return -ENODEV;
} }
wilc = vif->wilc;
priv = wiphy_priv(vif->ndev->ieee80211_ptr->wiphy); priv = wiphy_priv(vif->ndev->ieee80211_ptr->wiphy);
netdev_dbg(ndev, "MAC OPEN[%p]\n", ndev); netdev_dbg(ndev, "MAC OPEN[%p]\n", ndev);
...@@ -932,13 +930,13 @@ int wilc_mac_open(struct net_device *ndev) ...@@ -932,13 +930,13 @@ int wilc_mac_open(struct net_device *ndev)
wilc_set_wfi_drv_handler(vif, wilc_set_wfi_drv_handler(vif,
wilc_get_vif_idx(vif), wilc_get_vif_idx(vif),
0); 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_set_wfi_drv_handler(vif,
wilc_get_vif_idx(vif), wilc_get_vif_idx(vif),
wilc->open_ifcs); wl->open_ifcs);
} else { } else {
if (memcmp(wilc->vif[i ^ 1]->bssid, if (memcmp(wl->vif[i ^ 1]->bssid,
wilc->vif[i ^ 1]->src_addr, 6)) wl->vif[i ^ 1]->src_addr, 6))
wilc_set_wfi_drv_handler(vif, wilc_set_wfi_drv_handler(vif,
wilc_get_vif_idx(vif), wilc_get_vif_idx(vif),
0); 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment