summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Stephens <allan.stephens@windriver.com>2006-10-16 21:50:20 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-10-18 19:55:18 -0700
commit3a8d12142eab420ffcbbf3d1d2e637158e85aab8 (patch)
treeeab094224f22abdaa52b81fcf7c8fc2a5f06004b
parenta3df92c73b92970dc4211189b87eb4cf874f5685 (diff)
downloadlinux-3a8d12142eab420ffcbbf3d1d2e637158e85aab8.tar.gz
linux-3a8d12142eab420ffcbbf3d1d2e637158e85aab8.tar.bz2
linux-3a8d12142eab420ffcbbf3d1d2e637158e85aab8.zip
[TIPC]: Add support for Ethernet VLANs
This patch enhances TIPC's Ethernet support to include VLAN interfaces. Signed-off-by: Allan Stephens <allan.stephens@windriver.com> Signed-off-by: Per Liden <per.liden@ericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/tipc/core.c2
-rw-r--r--net/tipc/core.h8
2 files changed, 7 insertions, 3 deletions
diff --git a/net/tipc/core.c b/net/tipc/core.c
index 0539a8362858..7f3f693e5125 100644
--- a/net/tipc/core.c
+++ b/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/net/tipc/core.h b/net/tipc/core.h
index d1c3948eb4e8..4638947c2326 100644
--- a/net/tipc/core.h
+++ b/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;