aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-sll.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-02-26 22:03:12 -0500
committerMichael Mann <mmann78@netscape.net>2015-03-01 12:54:33 +0000
commit9c55903029ee0e6720597ef07e8a5b359cae068e (patch)
tree251dddfa5de23777e225e128529b00a7a0143b76 /epan/dissectors/packet-sll.c
parent5f2c8e9575eb6afb6c645d43a015cff035fcbeb0 (diff)
Use COPY_ADDRESS_SHALLOW instead of duplicating TVB_SET_ADDRESS and SET_ADDRESS calls for the same address.
Change-Id: I0c9cc5d574fdd73ecf1f8b32dbbf0ddb2b885116 Reviewed-on: https://code.wireshark.org/review/7437 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-sll.c')
-rw-r--r--epan/dissectors/packet-sll.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c
index 70af9aac8b..8809a8ed39 100644
--- a/epan/dissectors/packet-sll.c
+++ b/epan/dissectors/packet-sll.c
@@ -245,12 +245,12 @@ dissect_sll(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
switch (halen) {
case 4:
TVB_SET_ADDRESS(&pinfo->dl_src, AT_IPv4, tvb, 6, 4);
- TVB_SET_ADDRESS(&pinfo->src, AT_IPv4, tvb, 6, 4);
+ COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->dl_src);
proto_tree_add_item(fh_tree, &hfi_sll_src_ipv4, tvb, 6, 4, ENC_BIG_ENDIAN);
break;
case 6:
TVB_SET_ADDRESS(&pinfo->dl_src, AT_ETHER, tvb, 6, 6);
- TVB_SET_ADDRESS(&pinfo->src, AT_ETHER, tvb, 6, 6);
+ COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->dl_src);
proto_tree_add_item(fh_tree, &hfi_sll_src_eth, tvb, 6, 6, ENC_NA);
break;
case 0: