diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-02-03 16:59:21 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-02-03 16:59:21 +0000 |
| commit | 2a0e96b2a0e2569bb17807cf379f2b7ec6102073 (patch) | |
| tree | b48b66ef7ffa958de574a12a624dff1fcf563203 | |
| parent | 984524db42fe41ccbadf31204740663a9496ae19 (diff) | |
| download | wireshark-2a0e96b2a0e2569bb17807cf379f2b7ec6102073.tar.gz wireshark-2a0e96b2a0e2569bb17807cf379f2b7ec6102073.tar.bz2 wireshark-2a0e96b2a0e2569bb17807cf379f2b7ec6102073.zip | |
Try to get rid of unused code warnings.
svn path=/trunk/; revision=31778
| -rw-r--r-- | asn1/lte-rrc/lte-rrc.cnf | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-llc.c | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/asn1/lte-rrc/lte-rrc.cnf b/asn1/lte-rrc/lte-rrc.cnf index 8743a2f031..287c5ae834 100644 --- a/asn1/lte-rrc/lte-rrc.cnf +++ b/asn1/lte-rrc/lte-rrc.cnf @@ -35,6 +35,7 @@ UE-EUTRA-Capability @ue_eutra_cap #.OMIT_ASSIGNMENT # Get rid of unused code warnings +VarMeasReport VarShortMAC-Input VarMeasConfig VarMeasReportList diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c index edf0f646c8..acd58e4c50 100644 --- a/epan/dissectors/packet-llc.c +++ b/epan/dissectors/packet-llc.c @@ -210,7 +210,6 @@ http://www.cisco.com/univercd/cc/td/doc/product/software/ios113ed/113ed_cr/ibm_r { OUI_TURBOCELL, "Karlnet (Turbocell)" }, { OUI_CISCOWL, "Cisco Wireless (Aironet) L2" }, { OUI_MARVELL, "Marvell Semiconductor" }, - { OUI_ERICSSON_2, "Ericsson Group" }, { OUI_BRIDGED, "Frame Relay or ATM bridged frames" }, { OUI_IEEE_802_1, "IEEE 802.1 Committee" }, { OUI_ATM_FORUM, "ATM Forum" }, @@ -221,7 +220,9 @@ http://www.cisco.com/univercd/cc/td/doc/product/software/ios113ed/113ed_cr/ibm_r { OUI_APPLE_ATALK, "Apple (AppleTalk)" }, { OUI_HP, "Hewlett-Packard" }, { OUI_HP_2, "Hewlett-Packard" }, - { OUI_3GPP2, "3GPP2" }, + /* Registry Name: PPP Vendor Specific OUI Options */ + { OUI_3GPP2, "3GPP2 Vendor specific packet ID" }, + { OUI_ERICSSON_2, "Ericsson Group" }, { 0, NULL } }; |