ath6kl: Introduce spinlock to protect vif specific information

Use this spinlock to protect the vif's data instead of
one from ath6kl.

Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index b242b31eb19e9fefa1a4a731336b4a8cb94bc298..d5957b3087876d64d0ad6548dc7d7e24a5d2d8b1 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -2077,6 +2077,7 @@ static int ath6kl_init_if_data(struct ath6kl_vif *vif)
        setup_timer(&vif->disconnect_timer, disconnect_timer_handler,
                    (unsigned long) vif->ndev);
        set_bit(WMM_ENABLED, &vif->flags);
+       spin_lock_init(&vif->if_lock);
 
        return 0;
 }

diff --git a/drivers/net/wireless/ath/ath6kl/core.h b/drivers/net/wireless/ath/ath6kl/core.h
index 747e5a70ba5a6ff8d7c223af4c098dd7dcd7faf6..2c6465263ae36071378e504f13008089386a3e54 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/core.h
+++ b/drivers/net/wireless/ath/ath6kl/core.h
@@ -400,6 +400,8 @@ struct ath6kl_vif {
        struct wireless_dev wdev;
        struct net_device *ndev;
        struct ath6kl *ar;
+       /* Lock to protect vif specific net_stats and flags */
+       spinlock_t if_lock;
        u8 fw_vif_idx;
        unsigned long flags;
        int ssid_len;

diff --git a/drivers/net/wireless/ath/ath6kl/main.c b/drivers/net/wireless/ath/ath6kl/main.c
index 6bf94025221a42c506b31044595723e73a02f6be..ca86ed368da272877a7c54877c4861e0ce9926bc 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/main.c
+++ b/drivers/net/wireless/ath/ath6kl/main.c
@@ -989,11 +989,11 @@ void ath6kl_connect_event(struct ath6kl_vif *vif, u16 channel, u8 *bssid,
        netif_wake_queue(vif->ndev);
 
        /* Update connect & link status atomically */
-       spin_lock_bh(&ar->lock);
+       spin_lock_bh(&vif->if_lock);
        set_bit(CONNECTED, &vif->flags);
        clear_bit(CONNECT_PEND, &vif->flags);
        netif_carrier_on(vif->ndev);
-       spin_unlock_bh(&ar->lock);
+       spin_unlock_bh(&vif->if_lock);
 
        aggr_reset_state(vif->aggr_cntxt);
        vif->reconnect_flag = 0;
@@ -1345,10 +1345,10 @@ void ath6kl_disconnect_event(struct ath6kl_vif *vif, u8 reason, u8 *bssid,
        }
 
        /* update connect & link status atomically */
-       spin_lock_bh(&ar->lock);
+       spin_lock_bh(&vif->if_lock);
        clear_bit(CONNECTED, &vif->flags);
        netif_carrier_off(vif->ndev);
-       spin_unlock_bh(&ar->lock);
+       spin_unlock_bh(&vif->if_lock);
 
        if ((reason != CSERV_DISCONNECT) || (vif->reconnect_flag != 1))
                vif->reconnect_flag = 0;
@@ -1365,11 +1365,8 @@ void ath6kl_disconnect_event(struct ath6kl_vif *vif, u8 reason, u8 *bssid,
 
 static int ath6kl_open(struct net_device *dev)
 {
-       struct ath6kl *ar = ath6kl_priv(dev);
        struct ath6kl_vif *vif = netdev_priv(dev);
 
-       spin_lock_bh(&ar->lock);
-
        set_bit(WLAN_ENABLED, &vif->flags);
 
        if (test_bit(CONNECTED, &vif->flags)) {
@@ -1378,8 +1375,6 @@ static int ath6kl_open(struct net_device *dev)
        } else
                netif_carrier_off(dev);
 
-       spin_unlock_bh(&ar->lock);
-
        return 0;
 }
 

diff --git a/drivers/net/wireless/ath/ath6kl/txrx.c b/drivers/net/wireless/ath/ath6kl/txrx.c
index e4a6d8f54177dc665c03e78f123f9872c7d72317..ff288da2661c154a9aaaee2d8df174b57f5241ba 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/txrx.c
+++ b/drivers/net/wireless/ath/ath6kl/txrx.c
@@ -475,9 +475,9 @@ enum htc_send_full_action ath6kl_tx_queue_full(struct htc_target *target,
                return HTC_SEND_FULL_DROP;
 
 stop_net_queues:
-       spin_lock_bh(&ar->lock);
+       spin_lock_bh(&vif->if_lock);
        set_bit(NETQ_STOPPED, &vif->flags);
-       spin_unlock_bh(&ar->lock);
+       spin_unlock_bh(&vif->if_lock);
        netif_stop_queue(vif->ndev);
 
        return HTC_SEND_FULL_KEEP;
@@ -1103,12 +1103,12 @@ void ath6kl_rx(struct htc_target *target, struct htc_packet *packet)
         * Take lock to protect buffer counts and adaptive power throughput
         * state.
         */
-       spin_lock_bh(&ar->lock);
+       spin_lock_bh(&vif->if_lock);
 
        vif->net_stats.rx_packets++;
        vif->net_stats.rx_bytes += packet->act_len;
 
-       spin_unlock_bh(&ar->lock);
+       spin_unlock_bh(&vif->if_lock);
 
 
        ath6kl_dbg_dump(ATH6KL_DBG_RAW_BYTES, __func__, "rx ",