Skip to contentSkip to conversation

iwmc3200wifi: Fix test of unsigned in iwm_ntf_stop_resume_tx()

PATCH In review Roel Kluin 3 participants 5 messages Dec 16, 2009 – Dec 17, 2009 Networking drivers (wireless)

lore
Share & tools
lore

Roel Kluin

author
#0 lore raw

PATCH 1/1 iwmc3200wifi: Fix test of unsigned in iwm_ntf_stop_resume_tx()

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

Signed-off-by Roel Kluin <[email protected]>

---
Found using coccinelle: http://coccinelle.lip6.fr/

drivers/net/wireless/iwmc3200wifi/rx.c +1 -1
index 1c57c1f..9ac72e4 100644
@@ -1128,7 +1128,7 @@ static int iwm_ntf_stop_resume_tx(struct iwm_priv *iwm, u8 *buf,
 			struct iwm_tx_queue *txq;
 			u16 queue = iwm_tid_to_queue(bit);
 
-			if (queue < 0)
+			if (queue == -EINVAL)
 				continue;
 
 			txq = &iwm->txq[queue];
#1 lore raw
Quoted 11 lines · Roel Kluin

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

Signed-off-by Roel Kluin <[email protected]>

---
Found using coccinelle: http://coccinelle.lip6.fr/

drivers/net/wireless/iwmc3200wifi/rx.c +0 -0
index 1c57c1f..9ac72e4 100644

drivers/net/wireless/iwmc3200wifi/rx.c static int iwm_ntf_stop_resume_tx(struct iwm_priv *iwm, u8 *buf, · line 1131

Quoted 5 lines
drivers/net/wireless/iwmc3200wifi/rx.c +1 -1
@@ -1128,7 +1128,7 @@ static int iwm_ntf_stop_resume_tx(struct iwm_priv *iwm, u8 *buf,
 			struct iwm_tx_queue *txq;
 			u16 queue = iwm_tid_to_queue(bit);
 
-			if (queue < 0)
+			if (queue == -EINVAL)

I think it's ugly. iwm_tid_to_queue() should return int if it's allowed to return error codes.

Signature · 2 lines
Regards,
Pavel Roskin
author
#2 lore raw

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

Signed-off-by Roel Kluin <[email protected]>

---
Found using coccinelle: http://coccinelle.lip6.fr/

Quoted 5 lines

Review

Quoted 2 lines
(quoted diff) +1 -1
-			if (queue < 0)
+			if (queue == -EINVAL)

I think it's ugly. iwm_tid_to_queue() should return int if it's allowed to return error codes.

Ok, how about:

 drivers/net/wireless/iwmc3200wifi/iwm.h    |    2 +-
 drivers/net/wireless/iwmc3200wifi/netdev.c |    2 +-
 drivers/net/wireless/iwmc3200wifi/rx.c     |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/iwmc3200wifi/iwm.h +1 -1
index 5a26bb0..79ffa3b 100644
@@ -349,7 +349,7 @@ int iwm_up(struct iwm_priv *iwm);
 int iwm_down(struct iwm_priv *iwm);
 
 /* 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_worker(struct work_struct *work);
 int iwm_xmit_frame(struct sk_buff *skb, struct net_device *netdev);
drivers/net/wireless/iwmc3200wifi/netdev.c +1 -1
index e4f0f87..c4c0d23 100644
@@ -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 };
 
-u16 iwm_tid_to_queue(u16 tid)
+int iwm_tid_to_queue(u16 tid)
 {
 	if (tid > IWM_UMAC_TID_NR - 2)
 		return -EINVAL;
drivers/net/wireless/iwmc3200wifi/rx.c +1 -1
index 1c57c1f..6d6ed74 100644
@@ -1126,7 +1126,7 @@ static int iwm_ntf_stop_resume_tx(struct iwm_priv *iwm, u8 *buf,
 
 		if (!stop) {
 			struct iwm_tx_queue *txq;
-			u16 queue = iwm_tid_to_queue(bit);
+			int queue = iwm_tid_to_queue(bit);
 
 			if (queue < 0)
 				continue;
Reviewed-by
#3 lore raw

drivers/net/wireless/iwmc3200wifi/netdev.c static int iwm_stop(struct net_device *ndev) · line 79

Quoted 4 lines · Roel Kluin

Ok, how about:

drivers/net/wireless/iwmc3200wifi/netdev.c +1 -1
-u16 iwm_tid_to_queue(u16 tid)
+int iwm_tid_to_queue(u16 tid)

That's much better! Thanks!

Reviewed-by Pavel Roskin <[email protected]>
Signature · 2 lines
Regards,
Pavel Roskin
Acked-by
#4 lore raw
In reply to Roel Kluin
Quoted 50 lines · Roel Kluin

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

Signed-off-by Roel Kluin <[email protected]>

---
Found using coccinelle: http://coccinelle.lip6.fr/

Quoted 5 lines

Review

Quoted 2 lines
(quoted diff) +1 -1
-			if (queue < 0)
+			if (queue == -EINVAL)

I think it's ugly. iwm_tid_to_queue() should return int if it's allowed to return error codes.

Ok, how about:

 drivers/net/wireless/iwmc3200wifi/iwm.h    |    2 +-
 drivers/net/wireless/iwmc3200wifi/netdev.c |    2 +-
 drivers/net/wireless/iwmc3200wifi/rx.c     |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/iwmc3200wifi/iwm.h +1 -1
index 5a26bb0..79ffa3b 100644
@@ -349,7 +349,7 @@ int iwm_up(struct iwm_priv *iwm);
 int iwm_down(struct iwm_priv *iwm);
 
 /* 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_worker(struct work_struct *work);
 int iwm_xmit_frame(struct sk_buff *skb, struct net_device *netdev);
drivers/net/wireless/iwmc3200wifi/netdev.c +1 -1
index e4f0f87..c4c0d23 100644
@@ -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 };
 
-u16 iwm_tid_to_queue(u16 tid)
+int iwm_tid_to_queue(u16 tid)
 {
 	if (tid > IWM_UMAC_TID_NR - 2)
 		return -EINVAL;
drivers/net/wireless/iwmc3200wifi/rx.c +0 -0
index 1c57c1f..6d6ed74 100644

drivers/net/wireless/iwmc3200wifi/rx.c static int iwm_ntf_stop_resume_tx(struct iwm_priv *iwm, u8 *buf, · line 1132

Quoted 8 lines
drivers/net/wireless/iwmc3200wifi/rx.c +1 -1
@@ -1126,7 +1126,7 @@ static int iwm_ntf_stop_resume_tx(struct iwm_priv *iwm, u8 *buf,
 
 		if (!stop) {
 			struct iwm_tx_queue *txq;
-			u16 queue = iwm_tid_to_queue(bit);
+			int queue = iwm_tid_to_queue(bit);
 
 			if (queue < 0)
 				continue;

Good catch. Thanks both for the fix.

Acked-by Zhu Yi <[email protected]>

Thanks,
-yi