From c5bd0062b3e6b6456512d223b84e8e82aa6aa1c9 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Wed, 27 Jan 2016 11:46:57 +0100
Subject: [PATCH] netsniff-ng: Rename proto_vlan.h to vlan.h

The proto_ prefix is reserved for dissectors and the header contains
helper functions not exclusive to the proto_vlan dissector, so give it a
more generic name.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
 dissector.h            | 2 +-
 proto_vlan.c           | 2 +-
 proto_vlan.h => vlan.h | 9 ++-------
 3 files changed, 4 insertions(+), 9 deletions(-)
 rename proto_vlan.h => vlan.h (68%)

diff --git a/dissector.h b/dissector.h
index d8ad6ac7..52f341b1 100644
--- a/dissector.h
+++ b/dissector.h
@@ -17,7 +17,7 @@
 #include "ring.h"
 #include "tprintf.h"
 #include "linktype.h"
-#include "proto_vlan.h"
+#include "vlan.h"
 
 #define PRINT_NORM		0
 #define PRINT_LESS		1
diff --git a/proto_vlan.c b/proto_vlan.c
index c1b3e65a..ebdf2819 100644
--- a/proto_vlan.c
+++ b/proto_vlan.c
@@ -10,7 +10,7 @@
 #include <netinet/in.h>    /* for ntohs() */
 
 #include "proto.h"
-#include "proto_vlan.h"
+#include "vlan.h"
 #include "dissector_eth.h"
 #include "pkt_buff.h"
 
diff --git a/proto_vlan.h b/vlan.h
similarity index 68%
rename from proto_vlan.h
rename to vlan.h
index dc31cfac..b58d1a26 100644
--- a/proto_vlan.h
+++ b/vlan.h
@@ -1,10 +1,5 @@
-/*
- * proto_vlan.h - VLAN proto helpers & declarations
- * Subject to the GPL, version 2.
- */
-
-#ifndef PROTO_VLAN_H
-#define PROTO_VLAN_H
+#ifndef VLAN_H
+#define VLAN_H
 
 #include <stdbool.h>
 #include <inttypes.h>
-- 
2.11.4.GIT