From: Francois-Xavier Le Bail <devel.fx.lebail@orange.fr>
Date: Sun, 2 Aug 2020 09:36:05 +0000 (+0200)
Subject: IEEE 802.11: Remove trailing "_if" from protocol names
X-Git-Tag: tcpdump-4.99-bp~299
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/4eb7a801c3f95306935525d49542652ee8c24f40

IEEE 802.11: Remove trailing "_if" from protocol names
---

diff --git a/print-802_11.c b/print-802_11.c
index 2992adc6..1129af43 100644
--- a/print-802_11.c
+++ b/print-802_11.c
@@ -2269,7 +2269,7 @@ void
 ieee802_11_if_print(netdissect_options *ndo,
 		    const struct pcap_pkthdr *h, const u_char *p)
 {
-	ndo->ndo_protocol = "802.11_if";
+	ndo->ndo_protocol = "802.11";
 	ndo->ndo_ll_hdr_len += ieee802_11_print(ndo, p, h->len, h->caplen, 0, 0);
 }
 
@@ -3466,7 +3466,7 @@ prism_if_print(netdissect_options *ndo,
 	u_int length = h->len;
 	uint32_t msgcode;
 
-	ndo->ndo_protocol = "prism_if";
+	ndo->ndo_protocol = "prism";
 	if (caplen < 4) {
 		nd_print_trunc(ndo);
 		ndo->ndo_ll_hdr_len += caplen;
@@ -3501,7 +3501,7 @@ void
 ieee802_11_radio_if_print(netdissect_options *ndo,
 			  const struct pcap_pkthdr *h, const u_char *p)
 {
-	ndo->ndo_protocol = "802.11_radio_if";
+	ndo->ndo_protocol = "802.11_radio";
 	ndo->ndo_ll_hdr_len += ieee802_11_radio_print(ndo, p, h->len, h->caplen);
 }
 
@@ -3514,6 +3514,6 @@ void
 ieee802_11_radio_avs_if_print(netdissect_options *ndo,
 			      const struct pcap_pkthdr *h, const u_char *p)
 {
-	ndo->ndo_protocol = "802.11_radio_avs_if";
+	ndo->ndo_protocol = "802.11_radio_avs";
 	ndo->ndo_ll_hdr_len += ieee802_11_radio_avs_print(ndo, p, h->len, h->caplen);
 }