rt2x00: Move crypto TX descriptor handling to rt2x00crypto.c

Move all code which determines the right TX descriptor
fields specific to crypto support into rt2x00crypto.c.
This makes the code in rt2x00queue more simpler and
better concentrates all crypto code into a single location.

With this we can also remove some ifdefs in rt2x00queue.c
since the code inside the ifdef is either very small, or
only calling empty functions (see empty function definitions
in rt2x00lib.h).

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

3 files changed, 36 insertions, 25 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00crypto.c b/drivers/net/wireless/rt2x00/rt2x00crypto.c
index c6709b392165..37ad0d2fb64c 100644
--- a/drivers/net/wireless/rt2x00/rt2x00crypto.c
+++ b/drivers/net/wireless/rt2x00/rt2x00crypto.c
@@ -46,6 +46,29 @@ enum cipher rt2x00crypto_key_to_cipher(struct ieee80211_key_conf *key)
         }
 }
 
+void rt2x00crypto_create_tx_descriptor(struct queue_entry *entry,
+                                       struct txentry_desc *txdesc)
+{
+        struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(entry->skb);
+        struct ieee80211_key_conf *hw_key = tx_info->control.hw_key;
+
+        __set_bit(ENTRY_TXD_ENCRYPT, &txdesc->flags);
+
+        txdesc->cipher = rt2x00crypto_key_to_cipher(hw_key);
+
+        if (hw_key->flags & IEEE80211_KEY_FLAG_PAIRWISE)
+                __set_bit(ENTRY_TXD_ENCRYPT_PAIRWISE, &txdesc->flags);
+
+        txdesc->key_idx = hw_key->hw_key_idx;
+        txdesc->iv_offset = ieee80211_get_hdrlen_from_skb(entry->skb);
+
+        if (!(hw_key->flags & IEEE80211_KEY_FLAG_GENERATE_IV))
+                __set_bit(ENTRY_TXD_ENCRYPT_IV, &txdesc->flags);
+
+        if (!(hw_key->flags & IEEE80211_KEY_FLAG_GENERATE_MMIC))
+                __set_bit(ENTRY_TXD_ENCRYPT_MMIC, &txdesc->flags);
+}
+
 unsigned int rt2x00crypto_tx_overhead(struct ieee80211_tx_info *tx_info)
 {
         struct ieee80211_key_conf *key = tx_info->control.hw_key;
diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h b/drivers/net/wireless/rt2x00/rt2x00lib.h
index 1e1893772b6c..03024327767b 100644
--- a/drivers/net/wireless/rt2x00/rt2x00lib.h
+++ b/drivers/net/wireless/rt2x00/rt2x00lib.h
@@ -218,6 +218,8 @@ static inline void rt2x00debug_update_crypto(struct rt2x00_dev *rt2x00dev,
  */
 #ifdef CONFIG_RT2X00_LIB_CRYPTO
 enum cipher rt2x00crypto_key_to_cipher(struct ieee80211_key_conf *key);
+void rt2x00crypto_create_tx_descriptor(struct queue_entry *entry,
+                                       struct txentry_desc *txdesc);
 unsigned int rt2x00crypto_tx_overhead(struct ieee80211_tx_info *tx_info);
 void rt2x00crypto_tx_copy_iv(struct sk_buff *skb, unsigned int iv_len);
 void rt2x00crypto_tx_remove_iv(struct sk_buff *skb, unsigned int iv_len);
@@ -231,6 +233,11 @@ static inline enum cipher rt2x00crypto_key_to_cipher(struct ieee80211_key_conf *
         return CIPHER_NONE;
 }
 
+static inline void rt2x00crypto_create_tx_descriptor(struct queue_entry *entry,
+                                                     struct txentry_desc *txdesc)
+{
+}
+
 static inline unsigned int rt2x00crypto_tx_overhead(struct ieee80211_tx_info *tx_info)
 {
         return 0;
@@ -256,7 +263,7 @@ static inline void rt2x00crypto_rx_insert_iv(struct sk_buff *skb,
                                              struct rxdone_entry_desc *rxdesc)
 {
 }
-#endif
+#endif /* CONFIG_RT2X00_LIB_CRYPTO */
 
 /*
  * RFkill handlers.
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index e4a1dbeb18fd..eaec6bd93ed5 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -55,14 +55,12 @@ struct sk_buff *rt2x00queue_alloc_rxskb(struct rt2x00_dev *rt2x00dev,
         /*
          * For IV/EIV/ICV assembly we must make sure there is
          * at least 8 bytes bytes available in headroom for IV/EIV
-         * and 4 bytes for ICV data as tailroon.
+         * and 8 bytes for ICV data as tailroon.
          */
-#ifdef CONFIG_RT2X00_LIB_CRYPTO
         if (test_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags)) {
                 head_size += 8;
-                tail_size += 4;
+                tail_size += 8;
         }
-#endif /* CONFIG_RT2X00_LIB_CRYPTO */
 
         /*
          * Allocate skbuffer.
@@ -174,7 +172,7 @@ static void rt2x00queue_create_tx_descriptor(struct queue_entry *entry,
         txdesc->cw_max = entry->queue->cw_max;
         txdesc->aifs = entry->queue->aifs;
 
-        /* Data length + CRC + IV/EIV/ICV/MMIC (when using encryption) */
+        /* Data length + CRC */
         data_length = entry->skb->len + 4;
 
         /*
@@ -183,34 +181,17 @@ static void rt2x00queue_create_tx_descriptor(struct queue_entry *entry,
         if (!(tx_info->flags & IEEE80211_TX_CTL_NO_ACK))
                 __set_bit(ENTRY_TXD_ACK, &txdesc->flags);
 
-#ifdef CONFIG_RT2X00_LIB_CRYPTO
         if (test_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags) &&
             !entry->skb->do_not_encrypt) {
-                struct ieee80211_key_conf *hw_key = tx_info->control.hw_key;
-
-                __set_bit(ENTRY_TXD_ENCRYPT, &txdesc->flags);
-
-                txdesc->cipher = rt2x00crypto_key_to_cipher(hw_key);
-
-                if (hw_key->flags & IEEE80211_KEY_FLAG_PAIRWISE)
-                        __set_bit(ENTRY_TXD_ENCRYPT_PAIRWISE, &txdesc->flags);
-
-                txdesc->key_idx = hw_key->hw_key_idx;
-                txdesc->iv_offset = ieee80211_get_hdrlen_from_skb(entry->skb);
+                /* Apply crypto specific descriptor information */
+                rt2x00crypto_create_tx_descriptor(entry, txdesc);
 
                 /*
                  * Extend frame length to include all encryption overhead
                  * that will be added by the hardware.
                  */
                 data_length += rt2x00crypto_tx_overhead(tx_info);
-
-                if (!(hw_key->flags & IEEE80211_KEY_FLAG_GENERATE_IV))
-                        __set_bit(ENTRY_TXD_ENCRYPT_IV, &txdesc->flags);
-
-                if (!(hw_key->flags & IEEE80211_KEY_FLAG_GENERATE_MMIC))
-                        __set_bit(ENTRY_TXD_ENCRYPT_MMIC, &txdesc->flags);
         }
-#endif /* CONFIG_RT2X00_LIB_CRYPTO */
 
         /*
          * Check if this is a RTS/CTS frame