Merge pull request #13649 from donaldsharp/unlock_the_node_or_else

[mirror_frr.git] / lib / vlan.h

diff --git a/lib/vlan.h b/lib/vlan.h
index 5e735aac1fbc840dfaba566bd2c6907e51fc8777..a601046820e4291a29035de66a3e3f09dc5eb8b6 100644 (file)
--- a/lib/vlan.h
+++ b/lib/vlan.h
@@ -1,29 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /* VLAN (802.1q) common header.
  * Copyright (C) 2016, 2017 Cumulus Networks, Inc.
- *
- * This file is part of FRR.
- *
- * FRR is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * FRR is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with FRR; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
  */
 
 #ifndef __VLAN_H__
 #define __VLAN_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* VLAN Identifier */
-typedef u_int16_t vlanid_t;
+typedef uint16_t vlanid_t;
 #define VLANID_MAX 4095
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __VLAN_H__ */