diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2017-08-13 23:17:21 -0700 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-08-14 08:57:02 +0000 |
| commit | 3298a5294316c51d0a77e07dbfc187148a328485 (patch) | |
| tree | afcfdbde60d82bbb1114b67ac78da5dc1fd47575 /epan/dissectors | |
| parent | d6eda2a3a398b5747717b6dbc13337a6d5314416 (diff) | |
wifi: fix "multiple definition of wifi_display_ie_handle" linker error
Change-Id: I4aee15cbf241d31c274dc511be2f86b8bfeae5b8
Fixes: v2.5.0rc0-683-g3c0ff67a9c ("ieee80211: Make a few dissector tables for vendor specific functionality")
Reviewed-on: https://code.wireshark.org/review/23069
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-wifi-display.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-wifi-p2p.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-wifi-display.c b/epan/dissectors/packet-wifi-display.c index 6e1a89632d..f7489f942b 100644 --- a/epan/dissectors/packet-wifi-display.c +++ b/epan/dissectors/packet-wifi-display.c @@ -97,7 +97,7 @@ static expert_field ei_wfd_subelem_len_invalid = EI_INIT; static expert_field ei_wfd_subelem_session_descr_invalid = EI_INIT; static expert_field ei_wfd_subelem_id = EI_INIT; -dissector_handle_t wifi_display_ie_handle; +static dissector_handle_t wifi_display_ie_handle; enum wifi_display_subelem { WFD_SUBELEM_DEVICE_INFO = 0, diff --git a/epan/dissectors/packet-wifi-p2p.c b/epan/dissectors/packet-wifi-p2p.c index 0a5ab5884a..7d1aecb385 100644 --- a/epan/dissectors/packet-wifi-p2p.c +++ b/epan/dissectors/packet-wifi-p2p.c @@ -431,7 +431,7 @@ static expert_field ei_wifi_p2p_attr_len = EI_INIT; static expert_field ei_wifi_p2p_anqp_length = EI_INIT; static expert_field ei_wifi_p2p_anqp_unexpected_padding = EI_INIT; -dissector_handle_t wifi_display_ie_handle; +static dissector_handle_t wifi_display_ie_handle; static void dissect_wifi_p2p_capability(proto_item *tlv_root, proto_item *tlv_item, |