wlcore/wl18xx/wl12xx: convert bitmaps to unsigned longs
The *_bit operations expect unsigned longs. Instead of casting the pointers, simply define various bitmaps as unsigned long (instead of u32). Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
这个提交包含在:
@@ -1609,7 +1609,7 @@ static bool wl18xx_lnk_high_prio(struct wl1271 *wl, u8 hlid,
|
||||
u8 thold;
|
||||
struct wl18xx_fw_status_priv *status_priv =
|
||||
(struct wl18xx_fw_status_priv *)wl->fw_status->priv;
|
||||
u32 suspend_bitmap;
|
||||
unsigned long suspend_bitmap;
|
||||
|
||||
/* if we don't have the link map yet, assume they all low prio */
|
||||
if (!status_priv)
|
||||
@@ -1617,12 +1617,12 @@ static bool wl18xx_lnk_high_prio(struct wl1271 *wl, u8 hlid,
|
||||
|
||||
/* suspended links are never high priority */
|
||||
suspend_bitmap = le32_to_cpu(status_priv->link_suspend_bitmap);
|
||||
if (test_bit(hlid, (unsigned long *)&suspend_bitmap))
|
||||
if (test_bit(hlid, &suspend_bitmap))
|
||||
return false;
|
||||
|
||||
/* the priority thresholds are taken from FW */
|
||||
if (test_bit(hlid, (unsigned long *)&wl->fw_fast_lnk_map) &&
|
||||
!test_bit(hlid, (unsigned long *)&wl->ap_fw_ps_map))
|
||||
if (test_bit(hlid, &wl->fw_fast_lnk_map) &&
|
||||
!test_bit(hlid, &wl->ap_fw_ps_map))
|
||||
thold = status_priv->tx_fast_link_prio_threshold;
|
||||
else
|
||||
thold = status_priv->tx_slow_link_prio_threshold;
|
||||
@@ -1636,17 +1636,17 @@ static bool wl18xx_lnk_low_prio(struct wl1271 *wl, u8 hlid,
|
||||
u8 thold;
|
||||
struct wl18xx_fw_status_priv *status_priv =
|
||||
(struct wl18xx_fw_status_priv *)wl->fw_status->priv;
|
||||
u32 suspend_bitmap;
|
||||
unsigned long suspend_bitmap;
|
||||
|
||||
/* if we don't have the link map yet, assume they all low prio */
|
||||
if (!status_priv)
|
||||
return true;
|
||||
|
||||
suspend_bitmap = le32_to_cpu(status_priv->link_suspend_bitmap);
|
||||
if (test_bit(hlid, (unsigned long *)&suspend_bitmap))
|
||||
if (test_bit(hlid, &suspend_bitmap))
|
||||
thold = status_priv->tx_suspend_threshold;
|
||||
else if (test_bit(hlid, (unsigned long *)&wl->fw_fast_lnk_map) &&
|
||||
!test_bit(hlid, (unsigned long *)&wl->ap_fw_ps_map))
|
||||
else if (test_bit(hlid, &wl->fw_fast_lnk_map) &&
|
||||
!test_bit(hlid, &wl->ap_fw_ps_map))
|
||||
thold = status_priv->tx_fast_stop_threshold;
|
||||
else
|
||||
thold = status_priv->tx_slow_stop_threshold;
|
||||
|
在新工单中引用
屏蔽一个用户