Move some stuff into the only code path where it's used.

AirPDCapPacketProcess() really does two different things; some of the
stuff it does in both code paths only needs to be done in one code path.
Make it so.

Change-Id: Idb231d729150781f323e88ed375c983a3afd2577
Reviewed-on: https://code.wireshark.org/review/10439
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 11 insertions, 11 deletions

diff --git a/epan/crypt/airpdcap.c b/epan/crypt/airpdcap.c
index 659c8075b4..53737a2684 100644
--- a/epan/crypt/airpdcap.c
+++ b/epan/crypt/airpdcap.c
@@ -623,8 +623,6 @@ INT AirPDcapPacketProcess(
 {
     const UCHAR *addr;
     AIRPDCAP_SEC_ASSOCIATION_ID id;
-    PAIRPDCAP_SEC_ASSOCIATION sa;
-    int offset = 0;
 
 #ifdef _DEBUG
 #define MSGBUF_LEN 255
@@ -680,15 +678,6 @@ INT AirPDcapPacketProcess(
         return AIRPDCAP_RET_REQ_DATA;
     }
 
-    /* get the Security Association structure for the STA and AP */
-    sa = AirPDcapGetSaPtr(ctx, &id);
-    if (sa == NULL){
-        return AIRPDCAP_RET_UNSUCCESS;
-    }
-
-    /* cache offset in the packet data (to scan encryption data) */
-    offset = mac_header_len;
-
     /* check if data is encrypted (use the WEP bit in the Frame Control field) */
     if (AIRPDCAP_WEP(data[1])==0)
     {
@@ -699,6 +688,17 @@ INT AirPDcapPacketProcess(
         }
     } else {
         if (mngDecrypt) {
+            PAIRPDCAP_SEC_ASSOCIATION sa;
+            int offset = 0;
+
+            /* get the Security Association structure for the STA and AP */
+            sa = AirPDcapGetSaPtr(ctx, &id);
+            if (sa == NULL){
+                return AIRPDCAP_RET_UNSUCCESS;
+            }
+
+            /* cache offset in the packet data (to scan encryption data) */
+            offset = mac_header_len;
 
             if (decrypt_data==NULL)
                 return AIRPDCAP_RET_UNSUCCESS;