From 7c023ac2e13009fc4d6475acc73575ead19836ff Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Thu, 3 Nov 2011 11:53:57 +0200 Subject: [PATCH] --- yaml --- r: 278103 b: refs/heads/master c: cf97fa9fdf145bff2a0117d2ead4a92b132f69f6 h: refs/heads/master i: 278101: b348977c99678105d643f1de8fdd452a2cf228b2 278099: 14dec19faea4b54ef321e96cd4c01cc88cbea455 278095: 51ce76e97ec5a5ed0753887e07311fcf6966ff5c v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath6kl/init.c | 6 ------ trunk/drivers/net/wireless/ath/ath6kl/main.c | 12 ------------ 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/[refs] b/[refs] index dcf5c1a97ee3..11523f35458d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11f6e40d9f21767a9090e4e559d3c63edf25e6c0 +refs/heads/master: cf97fa9fdf145bff2a0117d2ead4a92b132f69f6 diff --git a/trunk/drivers/net/wireless/ath/ath6kl/init.c b/trunk/drivers/net/wireless/ath/ath6kl/init.c index bb2254d3b439..abc1d8ea7f5f 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/init.c +++ b/trunk/drivers/net/wireless/ath/ath6kl/init.c @@ -1613,12 +1613,6 @@ int ath6kl_core_init(struct ath6kl *ar) */ memcpy(ndev->dev_addr, ar->mac_addr, ETH_ALEN); - ret = ath6kl_init_hw_stop(ar); - if (ret) { - ath6kl_err("Failed to stop hardware: %d\n", ret); - goto err_htc_cleanup; - } - return ret; err_rxbuf_cleanup: diff --git a/trunk/drivers/net/wireless/ath/ath6kl/main.c b/trunk/drivers/net/wireless/ath/ath6kl/main.c index f9410e41121a..021b2f65d541 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/main.c +++ b/trunk/drivers/net/wireless/ath/ath6kl/main.c @@ -1062,12 +1062,6 @@ struct ath6kl_vif *ath6kl_vif_first(struct ath6kl *ar) static int ath6kl_open(struct net_device *dev) { struct ath6kl_vif *vif = netdev_priv(dev); - int ret; - - /* FIXME: how to handle multi vif support? */ - ret = ath6kl_init_hw_start(vif->ar); - if (ret) - return ret; set_bit(WLAN_ENABLED, &vif->flags); @@ -1084,7 +1078,6 @@ static int ath6kl_close(struct net_device *dev) { struct ath6kl *ar = ath6kl_priv(dev); struct ath6kl_vif *vif = netdev_priv(dev); - int ret; netif_stop_queue(dev); @@ -1099,11 +1092,6 @@ static int ath6kl_close(struct net_device *dev) ath6kl_cfg80211_scan_complete_event(vif, true); - /* FIXME: how to handle multi vif support? */ - ret = ath6kl_init_hw_stop(ar); - if (ret) - return ret; - clear_bit(WLAN_ENABLED, &vif->flags); return 0;