From b719be4267678e3356b9c80f55aac533466c896c Mon Sep 17 00:00:00 2001
From: Allan Stephens <allan.stephens@windriver.com>
Date: Mon, 16 Oct 2006 21:50:20 -0700
Subject: [PATCH] --- yaml --- r: 40030 b: refs/heads/master c:
 3a8d12142eab420ffcbbf3d1d2e637158e85aab8 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/net/tipc/core.c | 2 +-
 trunk/net/tipc/core.h | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 571267787743..d5fbe4e01e2c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3df92c73b92970dc4211189b87eb4cf874f5685
+refs/heads/master: 3a8d12142eab420ffcbbf3d1d2e637158e85aab8
diff --git a/trunk/net/tipc/core.c b/trunk/net/tipc/core.c
index 0539a8362858..7f3f693e5125 100644
--- a/trunk/net/tipc/core.c
+++ b/trunk/net/tipc/core.c
@@ -90,7 +90,7 @@ int tipc_random;
 atomic_t tipc_user_count = ATOMIC_INIT(0);
 
 const char tipc_alphabet[] = 
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_";
+	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_.";
 
 /* configurable TIPC parameters */
 
diff --git a/trunk/net/tipc/core.h b/trunk/net/tipc/core.h
index d1c3948eb4e8..4638947c2326 100644
--- a/trunk/net/tipc/core.h
+++ b/trunk/net/tipc/core.h
@@ -275,11 +275,15 @@ static inline void k_term_timer(struct timer_list *timer)
 /*
  * TIPC message buffer code
  *
- * TIPC message buffer headroom leaves room for 14 byte Ethernet header, 
+ * TIPC message buffer headroom reserves space for a link-level header
+ * (in case the message is sent off-node),
  * while ensuring TIPC header is word aligned for quicker access
+ *
+ * The largest header currently supported is 18 bytes, which is used when
+ * the standard 14 byte Ethernet header has 4 added bytes for VLAN info
  */
 
-#define BUF_HEADROOM 16u 
+#define BUF_HEADROOM 20u
 
 struct tipc_skb_cb {
 	void *handle;