[rt2x00-users] [PATCH 2/5] rt2x00: Remove Q_INDEX_CRYPTO and ENTRY_OWNER_DEVICE_CRYPTO

[Gertjan van Wingerde]

On 08/14/10 21:02, Ivo van Doorn wrote:
> 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: Ivo van Doorn <IvDoorn at gmail.com>

Acked-by: Gertjan van Wingerde <gwingerde at gmail.com>

> ---
>  drivers/net/wireless/rt2x00/rt2x00debug.c |    7 +++----
>  drivers/net/wireless/rt2x00/rt2x00queue.h |    7 -------
>  2 files changed, 3 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/net/wireless/rt2x00/rt2x00debug.c b/drivers/net/wireless/rt2x00/rt2x00debug.c
> index b0498e7..74f0d67 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00debug.c
> +++ b/drivers/net/wireless/rt2x00/rt2x00debug.c
> @@ -338,16 +338,15 @@ static ssize_t rt2x00debug_read_queue_stats(struct file *file,
>  		return -ENOMEM;
>  
>  	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) {
>  		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->index[Q_INDEX],
> -				queue->index[Q_INDEX_DONE],
> -				queue->index[Q_INDEX_CRYPTO]);
> +				queue->index[Q_INDEX_DONE]);
>  
>  		spin_unlock_irqrestore(&queue->lock, irqflags);
>  	}
> diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wireless/rt2x00/rt2x00queue.h
> index 4de6596..cecc908 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00queue.h
> +++ b/drivers/net/wireless/rt2x00/rt2x00queue.h
> @@ -360,9 +360,6 @@ struct txentry_desc {
>   * @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
>   *	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
>   *	for the signal to start sending.
>   * @ENTRY_DATA_IO_FAILED: Hardware indicated that an IO error occured
> @@ -372,7 +369,6 @@ struct txentry_desc {
>  enum queue_entry_flags {
>  	ENTRY_BCN_ASSIGNED,
>  	ENTRY_OWNER_DEVICE_DATA,
> -	ENTRY_OWNER_DEVICE_CRYPTO,
>  	ENTRY_DATA_PENDING,
>  	ENTRY_DATA_IO_FAILED
>  };
> @@ -408,15 +404,12 @@ struct queue_entry {
>   * @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
>   *	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
>   *	of the index array.
>   */
>  enum queue_index {
>  	Q_INDEX,
>  	Q_INDEX_DONE,
> -	Q_INDEX_CRYPTO,
>  	Q_INDEX_MAX,
>  };
>