Fix Coverity CID 280402: Logically dead code.

svn path=/trunk/; revision=48740

diff --git a/epan/dissectors/packet-scop.c b/epan/dissectors/packet-scop.c
index 2ad2002a64124eabc17c64859b72e010938f9d33..123f9d1c7be788d608db6c2708b7a6d89cf07825 100644 (file)
--- a/epan/dissectors/packet-scop.c
+++ b/epan/dissectors/packet-scop.c
@@ -224,16 +224,10 @@ dissect_scop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     if (   (packet.transport == SCOP_TRANSPORT_UDP_CCM)
         || (packet.transport == SCOP_TRANSPORT_TCP_CCM)) {
-        next_tvb = NULL; /*dissect_zbee_secure(tvb, pinfo, scop_tree, offset, 0);*/
-        if (next_tvb == NULL) {
-            /* Decryption Failed. */
-            return;
-        }
-        offset = 0;
-    }
-    else {
-        next_tvb = tvb;
+        /* Decryption Failed. */
+        return;
     }
+    next_tvb = tvb;
 
     /* Extract the service type. */
     packet.service = tvb_get_guint8(next_tvb, offset);