Hi John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/rt2x00/rt2800usb.c between commit 674db1344443
("rt2x00: fix crash in rt2800usb_get_txwi") from Linus' tree and commit
31937c423ed3 ("rt2x00: Minor optimizazion in txdone path") from the
wireless tree.
I fixed it up (see below) anc can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/net/wireless/rt2x00/rt2800usb.c
index dbf501c,4b907a5..0000000
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@@ -538,11 -529,13 +538,12 @@@ static void rt2800usb_txdone(struct rt2
entry = rt2x00queue_get_entry(queue, Q_INDEX_DONE);
if (rt2800usb_txdone_entry_check(entry, reg))
break;
+ entry = NULL;
}
- if (!entry || rt2x00queue_empty(queue))
- break;
-
- rt2800_txdone_entry(entry, reg,
+ if (entry)
- rt2800_txdone_entry(entry, reg);
++ rt2800_txdone_entry(entry, reg,
+ rt2800usb_get_txwi(entry));
}
}
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
