From: dlg <dlg@openbsd.org>
Date: Wed, 5 Jan 2022 05:47:53 +0000 (+0000)
Subject: ethertypes.h has now added the missing ethertypes we're looking at here.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=cbc9c596c727ab0592663c413123c1f4606f7ab4;p=openbsd

ethertypes.h has now added the missing ethertypes we're looking at here.
---

diff --git a/usr.sbin/tcpdump/print-ether.c b/usr.sbin/tcpdump/print-ether.c
index 7e32387154d..b610a398f27 100644
--- a/usr.sbin/tcpdump/print-ether.c
+++ b/usr.sbin/tcpdump/print-ether.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print-ether.c,v 1.39 2021/12/01 18:28:46 deraadt Exp $	*/
+/*	$OpenBSD: print-ether.c,v 1.40 2022/01/05 05:47:53 dlg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -287,24 +287,14 @@ recurse:
 		}
 		return (1);
 
-#ifndef ETHERTYPE_NSH
-#define ETHERTYPE_NSH 0x894f
-#endif
 	case ETHERTYPE_NSH:
 		nsh_print(p, length);
 		return (1);
 
-#ifndef ETHERTYPE_PBB
-#define ETHERTYPE_PBB 0x88e7
-#endif
 	case ETHERTYPE_PBB:
 		ether_pbb_print(p, length, caplen);
 		return (1);
 
-#ifndef ETHERTYPE_NHRP
-#define ETHERTYPE_NHRP 0x2001
-#endif
-	case ETHERTYPE_NHRP:
 		nhrp_print(p, length);
 		return (1);