Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/staging/wilc1000/linux_wlan.c

+4 −6
Original line number Diff line number Diff line
@@ -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);