Commit 54e34fbb authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville

rt2x00: Remove Q_INDEX_CRYPTO and ENTRY_OWNER_DEVICE_CRYPTO

Q_INDEX_CRYPTO and ENTRY_OWNER_DEVICE_CRYPTO where initially
added with the plan to implement hardware encryption for rt2500pci.
However there are no plans to do so anymore as the crypto
mechanism in rt2500pci is very different then any other Ralink
device.

So we can now safely remove the definitions, and don't think
about this feature anymore. :)
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Acked-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5eb7efe8
...@@ -338,16 +338,15 @@ static ssize_t rt2x00debug_read_queue_stats(struct file *file, ...@@ -338,16 +338,15 @@ static ssize_t rt2x00debug_read_queue_stats(struct file *file,
return -ENOMEM; return -ENOMEM;
temp = data + temp = data +
sprintf(data, "qid\tcount\tlimit\tlength\tindex\tdone\tcrypto\n"); sprintf(data, "qid\tcount\tlimit\tlength\tindex\tdone\n");
queue_for_each(intf->rt2x00dev, queue) { queue_for_each(intf->rt2x00dev, queue) {
spin_lock_irqsave(&queue->lock, irqflags); spin_lock_irqsave(&queue->lock, irqflags);
temp += sprintf(temp, "%d\t%d\t%d\t%d\t%d\t%d\t%d\n", queue->qid, temp += sprintf(temp, "%d\t%d\t%d\t%d\t%d\t%d\n", queue->qid,
queue->count, queue->limit, queue->length, queue->count, queue->limit, queue->length,
queue->index[Q_INDEX], queue->index[Q_INDEX],
queue->index[Q_INDEX_DONE], queue->index[Q_INDEX_DONE]);
queue->index[Q_INDEX_CRYPTO]);
spin_unlock_irqrestore(&queue->lock, irqflags); spin_unlock_irqrestore(&queue->lock, irqflags);
} }
......
...@@ -360,9 +360,6 @@ struct txentry_desc { ...@@ -360,9 +360,6 @@ struct txentry_desc {
* @ENTRY_OWNER_DEVICE_DATA: This entry is owned by the device for data * @ENTRY_OWNER_DEVICE_DATA: This entry is owned by the device for data
* transfer (either TX or RX depending on the queue). The entry should * transfer (either TX or RX depending on the queue). The entry should
* only be touched after the device has signaled it is done with it. * only be touched after the device has signaled it is done with it.
* @ENTRY_OWNER_DEVICE_CRYPTO: This entry is owned by the device for data
* encryption or decryption. The entry should only be touched after
* the device has signaled it is done with it.
* @ENTRY_DATA_PENDING: This entry contains a valid frame and is waiting * @ENTRY_DATA_PENDING: This entry contains a valid frame and is waiting
* for the signal to start sending. * for the signal to start sending.
* @ENTRY_DATA_IO_FAILED: Hardware indicated that an IO error occured * @ENTRY_DATA_IO_FAILED: Hardware indicated that an IO error occured
...@@ -372,7 +369,6 @@ struct txentry_desc { ...@@ -372,7 +369,6 @@ struct txentry_desc {
enum queue_entry_flags { enum queue_entry_flags {
ENTRY_BCN_ASSIGNED, ENTRY_BCN_ASSIGNED,
ENTRY_OWNER_DEVICE_DATA, ENTRY_OWNER_DEVICE_DATA,
ENTRY_OWNER_DEVICE_CRYPTO,
ENTRY_DATA_PENDING, ENTRY_DATA_PENDING,
ENTRY_DATA_IO_FAILED ENTRY_DATA_IO_FAILED
}; };
...@@ -408,15 +404,12 @@ struct queue_entry { ...@@ -408,15 +404,12 @@ struct queue_entry {
* @Q_INDEX_DONE: Index pointer to the next entry which will be completed by * @Q_INDEX_DONE: Index pointer to the next entry which will be completed by
* the hardware and for which we need to run the txdone handler. If this * the hardware and for which we need to run the txdone handler. If this
* entry is not owned by the hardware the queue is considered to be empty. * entry is not owned by the hardware the queue is considered to be empty.
* @Q_INDEX_CRYPTO: Index pointer to the next entry which encryption/decription
* will be completed by the hardware next.
* @Q_INDEX_MAX: Keep last, used in &struct data_queue to determine the size * @Q_INDEX_MAX: Keep last, used in &struct data_queue to determine the size
* of the index array. * of the index array.
*/ */
enum queue_index { enum queue_index {
Q_INDEX, Q_INDEX,
Q_INDEX_DONE, Q_INDEX_DONE,
Q_INDEX_CRYPTO,
Q_INDEX_MAX, Q_INDEX_MAX,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment