From: Francois-Xavier Le Bail <devel.fx.lebail@orange.fr>
Date: Wed, 5 Aug 2020 20:15:45 +0000 (+0200)
Subject: Remove the unused DLT_LANE8023 link-layer dissector
X-Git-Tag: tcpdump-4.99-bp~290
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/aa8bf0f52768cf4671c1661a29e7c1dd9cf5f5ad

Remove the unused DLT_LANE8023 link-layer dissector

DLT_LANE8023 was never defined in libpcap.
It was, perhaps, defined in some SuSE libpcap update, but no evidence
of this.
It is not defined in OpenSuSE Leap 15.2 (information from Guy).
---

diff --git a/missing/dlnames.c b/missing/dlnames.c
index 61fa18c1..03c2b38c 100644
--- a/missing/dlnames.c
+++ b/missing/dlnames.c
@@ -119,9 +119,6 @@ static struct dlt_choice dlt_choices[] = {
 #ifdef DLT_LINUX_IRDA
 	DLT_CHOICE(DLT_LINUX_IRDA, "Linux IrDA"),
 #endif
-#ifdef DLT_LANE8023
-	DLT_CHOICE(DLT_LANE8023, "Linux 802.3 LANE"),
-#endif
 #ifdef DLT_CIP
 	DLT_CHOICE(DLT_CIP, "Linux Classical IP-over-ATM"),
 #endif
diff --git a/netdissect.h b/netdissect.h
index dde21bc8..6e966262 100644
--- a/netdissect.h
+++ b/netdissect.h
@@ -503,7 +503,6 @@ extern void juniper_ppp_if_print IF_PRINTER_ARGS;
 extern void juniper_pppoe_atm_if_print IF_PRINTER_ARGS;
 extern void juniper_pppoe_if_print IF_PRINTER_ARGS;
 extern void juniper_services_if_print IF_PRINTER_ARGS;
-extern u_int lane_if_print IF_PRINTER_ARGS;
 extern u_int ltalk_if_print IF_PRINTER_ARGS;
 extern void mfr_if_print IF_PRINTER_ARGS;
 extern void netanalyzer_if_print IF_PRINTER_ARGS;
diff --git a/print-lane.c b/print-lane.c
index d608ffde..09f92c06 100644
--- a/print-lane.c
+++ b/print-lane.c
@@ -115,12 +115,3 @@ lane_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
 	 */
 	ether_print(ndo, p, length, caplen, lane_hdr_print, p - 2, FALSE);
 }
-
-u_int
-lane_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
-{
-	ndo->ndo_protocol = "lane_if";
-	lane_print(ndo, p, h->len, h->caplen);
-
-	return (sizeof(struct lecdatahdr_8023));
-}
diff --git a/print.c b/print.c
index 780a6281..b79aaf8b 100644
--- a/print.c
+++ b/print.c
@@ -53,9 +53,6 @@ struct void_printer {
 };
 
 static const struct uint_printer uint_printers[] = {
-#ifdef DLT_LANE8023
-	{ lane_if_print,	DLT_LANE8023 },
-#endif
 #ifdef DLT_C_HDLC
 	{ chdlc_if_print,	DLT_C_HDLC },
 #endif