4 files changed, 8 insertions, 8 deletions

diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c
index 1e2d5c3ce1..25b00ec0e3 100644
--- a/epan/dissectors/packet-bssgp.c
+++ b/epan/dissectors/packet-bssgp.c
@@ -1243,7 +1243,7 @@ decode_nri(proto_tree *tf, build_info_t *bi, guint32 tmsi_tlli) {
   if (bssgp_decode_nri && (bssgp_nri_length > 0) && 
     (((tmsi_tlli & LOCAL_TLLI_MASK) == LOCAL_TLLI_MASK) ||
      ((tmsi_tlli & FOREIGN_TLLI_MASK) == FOREIGN_TLLI_MASK))) {
-    nri = get_masked_guint32(tmsi_tlli, make_mask32(bssgp_nri_length, 8));
+    nri = get_masked_guint32(tmsi_tlli, make_mask32( (guint8) bssgp_nri_length, 8));
     if (tf) {
       proto_tree_add_uint_hidden(tf, hf_bssgp_nri, bi->tvb, bi->offset, 4, 
       nri);     
diff --git a/epan/dissectors/packet-dtp.c b/epan/dissectors/packet-dtp.c
index 563c62b64e..4f6bc3af9b 100644
--- a/epan/dissectors/packet-dtp.c
+++ b/epan/dissectors/packet-dtp.c
@@ -111,7 +111,7 @@ dissect_dtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 
 		if (valuelength > 0) {
-			dissect_dtp_tlv(tvb, offset, valuelength, tlv_tree, ti, type);
+			dissect_dtp_tlv(tvb, offset, valuelength, tlv_tree, ti, (guint8) type);
 		}
 
 		offset += valuelength;
diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c
index bf579c3c2c..58ddfddcea 100644
--- a/epan/dissectors/packet-fcp.c
+++ b/epan/dissectors/packet-fcp.c
@@ -384,7 +384,7 @@ dissect_fcp_data (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
             proto_tree_add_uint_hidden (fcp_tree, hf_fcp_singlelun, tvb,
                                         0, 0, cdata->fcp_lun);
 
-        dissect_scsi_payload (tvb, pinfo, tree, 0, FALSE, cdata->fcp_dl, cdata->fcp_lun);
+        dissect_scsi_payload (tvb, pinfo, tree, 0, FALSE, cdata->fcp_dl, (guint16) cdata->fcp_lun);
     }
     else {
         dissect_scsi_payload (tvb, pinfo, tree, 0, FALSE, 0, 0xffff);
@@ -480,7 +480,7 @@ dissect_fcp_rsp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         if (flags & 0x2) {
             dissect_scsi_snsinfo (tvb, pinfo, tree, offset+24+rsplen,
                                   tvb_get_ntohl (tvb, offset+16), 
-				  cdata?cdata->fcp_lun:0xffff);
+				  (guint16) (cdata?cdata->fcp_lun:0xffff) );
         }
         if (cdata) {
             g_mem_chunk_free (fcp_req_vals, cdata);
diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c
index 17eae02be1..b6a8f29c08 100644
--- a/epan/dissectors/packet-iscsi.c
+++ b/epan/dissectors/packet-iscsi.c
@@ -1675,7 +1675,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off
 		  ~I_BIT)) == ISCSI_OPCODE_SCSI_COMMAND) {
         /* SCSI Command */
         dissect_scsi_cdb (tvb, pinfo, tree, cdb_offset, 16, SCSI_DEV_UNKNOWN, 
-		cdata?cdata->lun:0xffff);
+		(guint16) (cdata?cdata->lun:0xffff) );
     }
     else if (opcode == ISCSI_OPCODE_SCSI_RESPONSE) {
         if (scsi_status == 0x2) {
@@ -1691,12 +1691,12 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off
 					  iscsi_min (senseLen,
 						     end_offset-offset),
 					  
-					   cdata?cdata->lun:0xffff);
+					   (guint16) (cdata?cdata->lun:0xffff) );
 	    }
         }
         else {
             dissect_scsi_rsp (tvb, pinfo, tree, 
-		cdata?cdata->lun:0xffff, scsi_status);
+		(guint16) (cdata?cdata->lun:0xffff), scsi_status);
         }
     }
     else if ((opcode == ISCSI_OPCODE_SCSI_DATA_IN) ||
@@ -1705,7 +1705,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off
         dissect_scsi_payload (tvb, pinfo, tree, offset, 
 			      (opcode==ISCSI_OPCODE_SCSI_DATA_OUT),
                               iscsi_min (data_segment_len, end_offset-offset),
-			      cdata?cdata->lun:0xffff);
+			      (guint16) (cdata?cdata->lun:0xffff) );
     }
 }