diff options
| author | Renato Botelho <renato@netgate.com> | 2017-02-23 06:37:07 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-02-23 06:37:07 -0300 |
| commit | 4ef888db25896b2295f521c736ef04aa2e5e64ec (patch) | |
| tree | 3fcc00dda536bd32ae85bc09f21be4081d32bad5 /contrib/tcpdump/oui.c | |
| parent | 272ffd7c3e4e5e27910eb918e2e36556f2a8ec3a (diff) | |
| parent | af015c5bcac0e333adeec07eff0698bad3b91e95 (diff) | |
| download | FreeBSD-src-4ef888db25896b2295f521c736ef04aa2e5e64ec.zip FreeBSD-src-4ef888db25896b2295f521c736ef04aa2e5e64ec.tar.gz | |
Merge remote-tracking branch 'origin/stable/11' into devel-11
Diffstat (limited to 'contrib/tcpdump/oui.c')
| -rw-r--r-- | contrib/tcpdump/oui.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/tcpdump/oui.c b/contrib/tcpdump/oui.c index 2aea5ad..71425de 100644 --- a/contrib/tcpdump/oui.c +++ b/contrib/tcpdump/oui.c @@ -13,13 +13,12 @@ * Original code by Hannes Gredler (hannes@juniper.net) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include <tcpdump-stdinc.h> -#include "interface.h" +#include <netdissect-stdinc.h> +#include "netdissect.h" #include "oui.h" /* FIXME complete OUI list using a script */ @@ -27,6 +26,7 @@ const struct tok oui_values[] = { { OUI_ENCAP_ETHER, "Ethernet" }, { OUI_CISCO, "Cisco" }, + { OUI_IANA, "IANA" }, { OUI_NORTEL, "Nortel Networks SONMP" }, { OUI_CISCO_90, "Cisco bridged" }, { OUI_RFC2684, "Ethernet bridged" }, |
