cdma2k : fix no previous prototype for function 'proto_[register|reg_handoff]_cdma2k...

[metze/wireshark/wip.git] / epan / dissectors / packet-frame.c

diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c
index 7dac6b812039c9c1d9dc58002d16aaf96ed32112..9c24767c8ba64426263503f7dd4861e7834d529d 100644 (file)
--- a/epan/dissectors/packet-frame.c
+++ b/epan/dissectors/packet-frame.c
@@ -245,7 +245,8 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
                                break;
 
                        case WTAP_ENCAP_BLUETOOTH_HCI:
-                               pinfo->p2p_dir = pinfo->pseudo_header->bthci.sent;
+                               pinfo->p2p_dir = pinfo->pseudo_header->bthci.sent ?
+                                       P2P_DIR_SENT : P2P_DIR_RECV;
                                break;
 
                        case WTAP_ENCAP_LAPB:
@@ -304,10 +305,10 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
                item = proto_tree_add_item(tree, proto_pkt_comment, tvb, 0, 0, ENC_NA);
                comments_tree = proto_item_add_subtree(item, ett_comments);
                comment_item = proto_tree_add_string_format(comments_tree, hf_comments_text, tvb, 0, 0,
-                                                                          fr_data->pkt_comment, "%s",
-                                                                          fr_data->pkt_comment);
+                                                                          fr_data->pkt_comment, "%s",
+                                                                          fr_data->pkt_comment);
                expert_add_info_format(pinfo, comment_item, &ei_comments_text,
-                                                              "%s",  fr_data->pkt_comment);
+                                                              "%s",  fr_data->pkt_comment);
 
 
        }
@@ -414,10 +415,10 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
                                if_item = proto_tree_add_uint(fh_tree, hf_frame_interface_id, tvb, 0, 0, pinfo->rec->rec_header.packet_header.interface_id);
                        }
 
-                        if (interface_description) {
+                       if (interface_description) {
                                if_tree = proto_item_add_subtree(if_item, ett_ifname);
                                proto_tree_add_string(if_tree, hf_frame_interface_description, tvb, 0, 0, interface_description);
-                        }
+                       }
                }
 
                if (pinfo->rec->presence_flags & WTAP_HAS_PACK_FLAGS) {
@@ -761,7 +762,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
                                }
                        }
                }
-        }
+       }
 
        return tvb_captured_length(tvb);
 }