Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e74b3aa authored by Eliad Peller's avatar Eliad Peller Committed by John W. Linville
Browse files

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: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9bccb8ae

drivers/net/wireless/ti/wl12xx/main.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1668,7 +1668,7 @@ static bool wl12xx_lnk_high_prio(struct wl1271 *wl, u8 hlid, 
{

{

	u8 thold;

	u8 thold;





	if (test_bit(hlid, (unsigned long *)&wl->fw_fast_lnk_map))

	if (test_bit(hlid, &wl->fw_fast_lnk_map))

		thold = wl->conf.tx.fast_link_thold;

		thold = wl->conf.tx.fast_link_thold;

	else

	else

		thold = wl->conf.tx.slow_link_thold;

		thold = wl->conf.tx.slow_link_thold;

drivers/net/wireless/ti/wl18xx/main.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -1609,7 +1609,7 @@ static bool wl18xx_lnk_high_prio(struct wl1271 *wl, u8 hlid, 
	u8 thold;

	u8 thold;

	struct wl18xx_fw_status_priv *status_priv =

	struct wl18xx_fw_status_priv *status_priv =

		(struct wl18xx_fw_status_priv *)wl->fw_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 we don't have the link map yet, assume they all low prio */

	if (!status_priv)

	if (!status_priv)
@@ -1617,12 +1617,12 @@ static bool wl18xx_lnk_high_prio(struct wl1271 *wl, u8 hlid, 




	/* suspended links are never high priority */

	/* suspended links are never high priority */

	suspend_bitmap = le32_to_cpu(status_priv->link_suspend_bitmap);

	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;

		return false;





	/* the priority thresholds are taken from FW */

	/* the priority thresholds are taken from FW */

	if (test_bit(hlid, (unsigned long *)&wl->fw_fast_lnk_map) &&

	if (test_bit(hlid, &wl->fw_fast_lnk_map) &&

	    !test_bit(hlid, (unsigned long *)&wl->ap_fw_ps_map))

	    !test_bit(hlid, &wl->ap_fw_ps_map))

		thold = status_priv->tx_fast_link_prio_threshold;

		thold = status_priv->tx_fast_link_prio_threshold;

	else

	else

		thold = status_priv->tx_slow_link_prio_threshold;

		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;

	u8 thold;

	struct wl18xx_fw_status_priv *status_priv =

	struct wl18xx_fw_status_priv *status_priv =

		(struct wl18xx_fw_status_priv *)wl->fw_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 we don't have the link map yet, assume they all low prio */

	if (!status_priv)

	if (!status_priv)

		return true;

		return true;





	suspend_bitmap = le32_to_cpu(status_priv->link_suspend_bitmap);

	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;

		thold = status_priv->tx_suspend_threshold;

	else if (test_bit(hlid, (unsigned long *)&wl->fw_fast_lnk_map) &&

	else if (test_bit(hlid, &wl->fw_fast_lnk_map) &&

		 !test_bit(hlid, (unsigned long *)&wl->ap_fw_ps_map))

		 !test_bit(hlid, &wl->ap_fw_ps_map))

		thold = status_priv->tx_fast_stop_threshold;

		thold = status_priv->tx_fast_stop_threshold;

	else

	else

		thold = status_priv->tx_slow_stop_threshold;

		thold = status_priv->tx_slow_stop_threshold;

drivers/net/wireless/ti/wlcore/debugfs.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -496,7 +496,7 @@ static ssize_t driver_state_read(struct file *file, char __user *user_buf, 
	DRIVER_STATE_PRINT_INT(sg_enabled);

	DRIVER_STATE_PRINT_INT(sg_enabled);

	DRIVER_STATE_PRINT_INT(enable_11a);

	DRIVER_STATE_PRINT_INT(enable_11a);

	DRIVER_STATE_PRINT_INT(noise);

	DRIVER_STATE_PRINT_INT(noise);

	DRIVER_STATE_PRINT_HEX(ap_fw_ps_map);

	DRIVER_STATE_PRINT_LHEX(ap_fw_ps_map);

	DRIVER_STATE_PRINT_LHEX(ap_ps_map);

	DRIVER_STATE_PRINT_LHEX(ap_ps_map);

	DRIVER_STATE_PRINT_HEX(quirks);

	DRIVER_STATE_PRINT_HEX(quirks);

	DRIVER_STATE_PRINT_HEX(irq);

	DRIVER_STATE_PRINT_HEX(irq);

drivers/net/wireless/ti/wlcore/main.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -333,7 +333,7 @@ static void wl12xx_irq_ps_regulate_link(struct wl1271 *wl, 
{

{

	bool fw_ps;

	bool fw_ps;





	fw_ps = test_bit(hlid, (unsigned long *)&wl->ap_fw_ps_map);

	fw_ps = test_bit(hlid, &wl->ap_fw_ps_map);





	/*

	/*

	 * Wake up from high level PS if the STA is asleep with too little

	 * Wake up from high level PS if the STA is asleep with too little
@@ -360,13 +360,13 @@ static void wl12xx_irq_update_links_status(struct wl1271 *wl, 
					   struct wl12xx_vif *wlvif,

					   struct wl12xx_vif *wlvif,

					   struct wl_fw_status *status)

					   struct wl_fw_status *status)

{

{

	u32 cur_fw_ps_map;

	unsigned long cur_fw_ps_map;

	u8 hlid;

	u8 hlid;





	cur_fw_ps_map = status->link_ps_bitmap;

	cur_fw_ps_map = status->link_ps_bitmap;

	if (wl->ap_fw_ps_map != cur_fw_ps_map) {

	if (wl->ap_fw_ps_map != cur_fw_ps_map) {

		wl1271_debug(DEBUG_PSM,

		wl1271_debug(DEBUG_PSM,

			     "link ps prev 0x%x cur 0x%x changed 0x%x",

			     "link ps prev 0x%lx cur 0x%lx changed 0x%lx",

			     wl->ap_fw_ps_map, cur_fw_ps_map,

			     wl->ap_fw_ps_map, cur_fw_ps_map,

			     wl->ap_fw_ps_map ^ cur_fw_ps_map);

			     wl->ap_fw_ps_map ^ cur_fw_ps_map);
@@ -4754,7 +4754,7 @@ void wl1271_free_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 hlid) 




	clear_bit(hlid, wlvif->ap.sta_hlid_map);

	clear_bit(hlid, wlvif->ap.sta_hlid_map);

	__clear_bit(hlid, &wl->ap_ps_map);

	__clear_bit(hlid, &wl->ap_ps_map);

	__clear_bit(hlid, (unsigned long *)&wl->ap_fw_ps_map);

	__clear_bit(hlid, &wl->ap_fw_ps_map);





	/*

	/*

	 * save the last used PN in the private part of iee80211_sta,

	 * save the last used PN in the private part of iee80211_sta,

drivers/net/wireless/ti/wlcore/tx.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -126,7 +126,7 @@ static void wl1271_tx_regulate_link(struct wl1271 *wl, 
	if (WARN_ON(!test_bit(hlid, wlvif->links_map)))

	if (WARN_ON(!test_bit(hlid, wlvif->links_map)))

		return;

		return;





	fw_ps = test_bit(hlid, (unsigned long *)&wl->ap_fw_ps_map);

	fw_ps = test_bit(hlid, &wl->ap_fw_ps_map);

	tx_pkts = wl->links[hlid].allocated_pkts;

	tx_pkts = wl->links[hlid].allocated_pkts;





	/*

	/*