CHANGES: Add changes backported to 4.99

[tcpdump] / print-token.c

diff --git a/print-token.c b/print-token.c
index 38f56eae894c7553e3a71295bbd4d81c1ed23b13..6426cfe23514edab48c4fc64a657aaa6c2253926 100644 (file)
--- a/print-token.c
+++ b/print-token.c
@@ -26,9 +26,7 @@
 
 /* \summary: Token Ring printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -152,7 +150,7 @@ token_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
        u_int route_len = 0, hdr_len = TOKEN_HDRLEN;
        int seg;
 
-       ndo->ndo_protocol = "token";
+       ndo->ndo_protocol = "token-ring";
        trp = (const struct token_header *)p;
 
        if (caplen < TOKEN_HDRLEN) {
@@ -245,6 +243,6 @@ token_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
 void
 token_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
-       ndo->ndo_protocol = "token";
+       ndo->ndo_protocol = "token-ring";
        ndo->ndo_ll_hdr_len += token_print(ndo, p, h->len, h->caplen);
 }