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

Commit 8585c2b8 authored by Roel Kluin's avatar Roel Kluin Committed by John W. Linville
Browse files

iwmc3200wifi: Fix test of unsigned in iwm_ntf_stop_resume_tx() 



`queue' was unsigned so the test did not work.

Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Reviewed-by: default avatarPavel Roskin <proski@gnu.org>
Acked-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 45b24168

drivers/net/wireless/iwmc3200wifi/iwm.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -349,7 +349,7 @@ int iwm_up(struct iwm_priv *iwm); 
int iwm_down(struct iwm_priv *iwm);

int iwm_down(struct iwm_priv *iwm);





/* TX API */

/* TX API */

u16 iwm_tid_to_queue(u16 tid);

int iwm_tid_to_queue(u16 tid);

void iwm_tx_credit_inc(struct iwm_priv *iwm, int id, int total_freed_pages);

void iwm_tx_credit_inc(struct iwm_priv *iwm, int id, int total_freed_pages);

void iwm_tx_worker(struct work_struct *work);

void iwm_tx_worker(struct work_struct *work);

int iwm_xmit_frame(struct sk_buff *skb, struct net_device *netdev);

int iwm_xmit_frame(struct sk_buff *skb, struct net_device *netdev);

drivers/net/wireless/iwmc3200wifi/netdev.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -76,7 +76,7 @@ static int iwm_stop(struct net_device *ndev) 
 */

 */

static const u16 iwm_1d_to_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 };

static const u16 iwm_1d_to_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 };





u16 iwm_tid_to_queue(u16 tid)

int iwm_tid_to_queue(u16 tid)

{

{

	if (tid > IWM_UMAC_TID_NR - 2)

	if (tid > IWM_UMAC_TID_NR - 2)

		return -EINVAL;

		return -EINVAL;

drivers/net/wireless/iwmc3200wifi/rx.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1126,7 +1126,7 @@ static int iwm_ntf_stop_resume_tx(struct iwm_priv *iwm, u8 *buf, 




		if (!stop) {

		if (!stop) {

			struct iwm_tx_queue *txq;

			struct iwm_tx_queue *txq;

			u16 queue = iwm_tid_to_queue(bit);

			int queue = iwm_tid_to_queue(bit);





			if (queue < 0)

			if (queue < 0)

				continue;

				continue;