mac80211: move TX station pointer and restructure TX

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / ath / ath9k / htc_drv_beacon.c

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
index 2eadffb7971cc82c935ab8db1530bb27944b0659..f42d2eb6af99302f449ef44beac8f0120238e73d 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
@@ -207,9 +207,9 @@ static void ath9k_htc_beacon_config_ap(struct ath9k_htc_priv *priv,
        else
                priv->ah->config.sw_beacon_response_time = MIN_SWBA_RESPONSE;
 
-       if (priv->op_flags & OP_TSF_RESET) {
+       if (test_bit(OP_TSF_RESET, &priv->op_flags)) {
                ath9k_hw_reset_tsf(priv->ah);
-               priv->op_flags &= ~OP_TSF_RESET;
+               clear_bit(OP_TSF_RESET, &priv->op_flags);
        } else {
                /*
                 * Pull nexttbtt forward to reflect the current TSF.
@@ -221,7 +221,7 @@ static void ath9k_htc_beacon_config_ap(struct ath9k_htc_priv *priv,
                } while (nexttbtt < tsftu);
        }
 
-       if (priv->op_flags & OP_ENABLE_BEACON)
+       if (test_bit(OP_ENABLE_BEACON, &priv->op_flags))
                imask |= ATH9K_INT_SWBA;
 
        ath_dbg(common, CONFIG,
@@ -269,7 +269,7 @@ static void ath9k_htc_beacon_config_adhoc(struct ath9k_htc_priv *priv,
        else
                priv->ah->config.sw_beacon_response_time = MIN_SWBA_RESPONSE;
 
-       if (priv->op_flags & OP_ENABLE_BEACON)
+       if (test_bit(OP_ENABLE_BEACON, &priv->op_flags))
                imask |= ATH9K_INT_SWBA;
 
        ath_dbg(common, CONFIG,
@@ -326,7 +326,7 @@ static void ath9k_htc_send_buffered(struct ath9k_htc_priv *priv,
                        goto next;
                }
 
-               ret = ath9k_htc_tx_start(priv, skb, tx_slot, true);
+               ret = ath9k_htc_tx_start(priv, NULL, skb, tx_slot, true);
                if (ret != 0) {
                        ath9k_htc_tx_clear_slot(priv, tx_slot);
                        dev_kfree_skb_any(skb);
@@ -365,7 +365,7 @@ static void ath9k_htc_send_beacon(struct ath9k_htc_priv *priv,
        vif = priv->cur_beacon_conf.bslot[slot];
        avp = (struct ath9k_htc_vif *)vif->drv_priv;
 
-       if (unlikely(priv->op_flags & OP_SCANNING)) {
+       if (unlikely(test_bit(OP_SCANNING, &priv->op_flags))) {
                spin_unlock_bh(&priv->beacon_lock);
                return;
        }