Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[~andy/linux] / drivers / net / wireless / rtlwifi / pci.c

diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 36bffbc4519eaa4d8c2a639d68c36fa5ffbe3f0e..80f75d3ba84ac0136e41d63ba31055686c66d2e1 100644 (file)
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -480,7 +480,7 @@ static void _rtl_pci_tx_chk_waitq(struct ieee80211_hw *hw)
 
        /* we juse use em for BE/BK/VI/VO */
        for (tid = 7; tid >= 0; tid--) {
-               u8 hw_queue = ac_to_hwq[rtl_tid_to_ac(hw, tid)];
+               u8 hw_queue = ac_to_hwq[rtl_tid_to_ac(tid)];
                struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[hw_queue];
                while (!mac->act_scanning &&
                       rtlpriv->psc.rfpwr_state == ERFON) {
@@ -756,10 +756,10 @@ done:
                if (index == rtlpci->rxringcount - 1)
                        rtlpriv->cfg->ops->set_desc((u8 *)pdesc, false,
                                                    HW_DESC_RXERO,
-                                                   (u8 *)&tmp_one);
+                                                   &tmp_one);
 
                rtlpriv->cfg->ops->set_desc((u8 *)pdesc, false, HW_DESC_RXOWN,
-                                           (u8 *)&tmp_one);
+                                           &tmp_one);
 
                index = (index + 1) % rtlpci->rxringcount;
        }
@@ -934,7 +934,7 @@ static void _rtl_pci_prepare_bcn_tasklet(struct ieee80211_hw *hw)
        __skb_queue_tail(&ring->queue, pskb);
 
        rtlpriv->cfg->ops->set_desc((u8 *) pdesc, true, HW_DESC_OWN,
-                                   (u8 *)&temp_one);
+                                   &temp_one);
 
        return;
 }
@@ -1126,11 +1126,11 @@ static int _rtl_pci_init_rx_ring(struct ieee80211_hw *hw)
                                                    rxbuffersize);
                        rtlpriv->cfg->ops->set_desc((u8 *) entry, false,
                                                    HW_DESC_RXOWN,
-                                                   (u8 *)&tmp_one);
+                                                   &tmp_one);
                }
 
                rtlpriv->cfg->ops->set_desc((u8 *) entry, false,
-                                           HW_DESC_RXERO, (u8 *)&tmp_one);
+                                           HW_DESC_RXERO, &tmp_one);
        }
        return 0;
 }
@@ -1263,7 +1263,7 @@ int rtl_pci_reset_trx_ring(struct ieee80211_hw *hw)
                                rtlpriv->cfg->ops->set_desc((u8 *) entry,
                                                            false,
                                                            HW_DESC_RXOWN,
-                                                           (u8 *)&tmp_one);
+                                                           &tmp_one);
                        }
                        rtlpci->rx_ring[rx_queue_idx].idx = 0;
                }
@@ -1423,7 +1423,7 @@ static int rtl_pci_tx(struct ieee80211_hw *hw, struct sk_buff *skb,
        __skb_queue_tail(&ring->queue, skb);
 
        rtlpriv->cfg->ops->set_desc((u8 *)pdesc, true,
-                                   HW_DESC_OWN, (u8 *)&temp_one);
+                                   HW_DESC_OWN, &temp_one);
 
 
        if ((ring->entries - skb_queue_len(&ring->queue)) < 2 &&