rt2x00: Fix txdone_entry_desc_flags

PATCH New Ivo van Doorn 1 participant 1 message Aug 15, 2008 Networking drivers (wireless)

lore

Share & tools

lore

Ivo van Doorn

author

2008-08-15 12:49 UTC #0 lore raw

PATCH 1/5 rt2x00: Fix txdone_entry_desc_flags

From: Jochen Friedrich <[email protected]>

txdone_entry_desc_flags is used with __set_bit and test_bit which bit-shift the values, so don't bit-shift the flags in the enum. Also make sure flags are initialized before being used.

Signed-off-by Jochen Friedrich <[email protected]>

Signed-off-by Ivo van Doorn <[email protected]>

---
John, please queue for 2.6.27 and 2.6.28

---
 drivers/net/wireless/rt2x00/rt2x00queue.h |    8 ++++----
 drivers/net/wireless/rt2x00/rt2x00usb.c   |    1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

drivers/net/wireless/rt2x00/rt2x00queue.h +4 -4

index 01a6567..37f3f98 100644
@@ -191,10 +191,10 @@ struct rxdone_entry_desc {
  *	frame transmission failed due to excessive retries.
  */
 enum txdone_entry_desc_flags {
-	TXDONE_UNKNOWN = 1 << 0,
-	TXDONE_SUCCESS = 1 << 1,
-	TXDONE_FAILURE = 1 << 2,
-	TXDONE_EXCESSIVE_RETRY = 1 << 3,
+	TXDONE_UNKNOWN,
+	TXDONE_SUCCESS,
+	TXDONE_FAILURE,
+	TXDONE_EXCESSIVE_RETRY,
 };
 
 /**

drivers/net/wireless/rt2x00/rt2x00usb.c +1 -0

index 8d76bb2..2050227 100644
@@ -181,6 +181,7 @@ static void rt2x00usb_interrupt_txdone(struct urb *urb)
 	 * (Only indirectly by looking at the failed TX counters
 	 * in the register).
 	 */
+	txdesc.flags = 0;
 	if (!urb->status)
 		__set_bit(TXDONE_UNKNOWN, &txdesc.flags);
 	else

Signature · 1 line

1.5.6.1