rt2x00: Optimize IV/EIV handling

IV and EIV belong to eachother and don't require
2 seperate fields. Instead they can logically be
merged into a single array with size 2.

With this approach we can simplify the code in
rt2x00crypto.c by using a single memcpy() when
copying the iv/eiv data. Additionally we can
move some code out of if-statements because the
if-statement would always be true.

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

1 files changed, 14 insertions, 30 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00crypto.c b/drivers/net/wireless/rt2x00/rt2x00crypto.c
index 5a858e5106c4..e0fc7c193040 100644
--- a/drivers/net/wireless/rt2x00/rt2x00crypto.c
+++ b/drivers/net/wireless/rt2x00/rt2x00crypto.c
@@ -78,10 +78,7 @@ void rt2x00crypto_tx_remove_iv(struct sk_buff *skb, unsigned int iv_len)
                 return;
 
         /* Copy IV/EIV data */
-        if (iv_len >= 4)
-                memcpy(&skbdesc->iv, skb->data + header_length, 4);
-        if (iv_len >= 8)
-                memcpy(&skbdesc->eiv, skb->data + header_length + 4, 4);
+        memcpy(skbdesc->iv, skb->data + header_length, iv_len);
 
         /* Move ieee80211 header */
         memmove(skb->data + iv_len, skb->data, header_length);
@@ -98,7 +95,7 @@ void rt2x00crypto_tx_insert_iv(struct sk_buff *skb)
         struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);
         unsigned int header_length = ieee80211_get_hdrlen_from_skb(skb);
         const unsigned int iv_len =
-            ((!!(skbdesc->iv)) * 4) + ((!!(skbdesc->eiv)) * 4);
+            ((!!(skbdesc->iv[0])) * 4) + ((!!(skbdesc->iv[1])) * 4);
 
         if (!(skbdesc->flags & FRAME_DESC_IV_STRIPPED))
                 return;
@@ -109,10 +106,7 @@ void rt2x00crypto_tx_insert_iv(struct sk_buff *skb)
         memmove(skb->data, skb->data + iv_len, header_length);
 
         /* Copy IV/EIV data */
-        if (iv_len >= 4)
-                memcpy(skb->data + header_length, &skbdesc->iv, 4);
-        if (iv_len >= 8)
-                memcpy(skb->data + header_length + 4, &skbdesc->eiv, 4);
+        memcpy(skb->data + header_length, skbdesc->iv, iv_len);
 
         /* IV/EIV data has returned into the frame */
         skbdesc->flags &= ~FRAME_DESC_IV_STRIPPED;
@@ -172,17 +166,9 @@ void rt2x00crypto_rx_insert_iv(struct sk_buff *skb, unsigned int align,
                 header_length);
         transfer += header_length;
 
-        /* Copy IV data */
-        if (iv_len >= 4) {
-                memcpy(skb->data + transfer, &rxdesc->iv, 4);
-                transfer += 4;
-        }
-
-        /* Copy EIV data */
-        if (iv_len >= 8) {
-                memcpy(skb->data + transfer, &rxdesc->eiv, 4);
-                transfer += 4;
-        }
+        /* Copy IV/EIV data */
+        memcpy(skb->data + transfer, rxdesc->iv, iv_len);
+        transfer += iv_len;
 
         /* Move payload */
         if (align) {
@@ -198,16 +184,14 @@ void rt2x00crypto_rx_insert_iv(struct sk_buff *skb, unsigned int align,
          */
         transfer += payload_len;
 
-        /* Copy ICV data */
-        if (icv_len >= 4) {
-                memcpy(skb->data + transfer, &rxdesc->icv, 4);
-                /*
-                 * AES appends 8 bytes, we can't fill the upper
-                 * 4 bytes, but mac80211 doesn't care about what
-                 * we provide here anyway and strips it immediately.
-                 */
-                transfer += icv_len;
-        }
+        /*
+         * Copy ICV data
+         * AES appends 8 bytes, we can't fill the upper
+         * 4 bytes, but mac80211 doesn't care about what
+         * we provide here anyway and strips it immediately.
+         */
+        memcpy(skb->data + transfer, &rxdesc->icv, 4);
+        transfer += icv_len;
 
         /* IV/EIV/ICV has been inserted into frame */
         rxdesc->size = transfer;