drivers/net: Remove boolean comparisons to true/false

[cascardo/linux.git] / drivers / net / wireless / mwl8k.c

diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index dd5aeaf..91c5f74 100644 (file)
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -1330,7 +1330,7 @@ static int rxq_process(struct ieee80211_hw *hw, int index, int limit)
                                                                wh->addr1);
 
                        if (mwl8k_vif != NULL &&
-                           mwl8k_vif->is_hw_crypto_enabled == true) {
+                           mwl8k_vif->is_hw_crypto_enabled) {
                                /*
                                 * When MMIC ERROR is encountered
                                 * by the firmware, payload is
@@ -1993,8 +1993,7 @@ mwl8k_txq_xmit(struct ieee80211_hw *hw, int index, struct sk_buff *skb)
         */
 
        if (txq->len >= MWL8K_TX_DESCS - 2) {
-               if (mgmtframe == false ||
-                       txq->len == MWL8K_TX_DESCS) {
+               if (!mgmtframe || txq->len == MWL8K_TX_DESCS) {
                        if (start_ba_session) {
                                spin_lock(&priv->stream_lock);
                                mwl8k_remove_stream(hw, stream);
@@ -4093,7 +4092,7 @@ static int mwl8k_set_key(struct ieee80211_hw *hw,
                return -EOPNOTSUPP;
 
        if (sta == NULL)
-               addr = hw->wiphy->perm_addr;
+               addr = vif->addr;
        else
                addr = sta->addr;