update

[l4.git] / l4 / pkg / linux-26-headers / include / linux / tipc_config.h

diff --git a/l4/pkg/linux-26-headers/include/linux/tipc_config.h b/l4/pkg/linux-26-headers/include/linux/tipc_config.h
index 2aac7ac1c90d31025b778acc2373f30dd32d8a44..b54c023b1a1fbddf7d6da70941ddde22beb532c4 100644 (file)
--- a/l4/pkg/linux-26-headers/include/linux/tipc_config.h
+++ b/l4/pkg/linux-26-headers/include/linux/tipc_config.h
@@ -1,5 +1,5 @@
 /*
- * include/linux/tipc_config.h: Include file for TIPC configuration interface
+ * include/uapi/linux/tipc_config.h: Header for TIPC configuration interface
  *
  * Copyright (c) 2003-2006, Ericsson AB
  * Copyright (c) 2005-2007, 2010-2011, Wind River Systems
@@ -39,6 +39,7 @@
 
 #include <linux/types.h>
 #include <linux/string.h>
+#include <linux/tipc.h>
 #include <asm/byteorder.h>
 
 #include <arpa/inet.h> /* for ntohs etc. */
@@ -152,15 +153,6 @@
 #define TIPC_TLV_NAME_TBL_QUERY        25      /* struct tipc_name_table_query */
 #define TIPC_TLV_PORT_REF      26      /* 32-bit port reference */
 
-/*
- * Maximum sizes of TIPC bearer-related names (including terminating NUL)
- */
-
-#define TIPC_MAX_MEDIA_NAME    16      /* format = media */
-#define TIPC_MAX_IF_NAME       16      /* format = interface */
-#define TIPC_MAX_BEARER_NAME   32      /* format = media:interface */
-#define TIPC_MAX_LINK_NAME     60      /* format = Z.C.N:interface-Z.C.N:interface */
-
 /*
  * Link priority limits (min, default, max, media default)
  */