Эх сурвалжийг харах

[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>
Allan Stephens 18 жил өмнө
parent
commit
3a8d12142e

+ 1 - 1
net/tipc/core.c

@@ -90,7 +90,7 @@ int tipc_random;
 atomic_t tipc_user_count = ATOMIC_INIT(0);
 atomic_t tipc_user_count = ATOMIC_INIT(0);
 
 
 const char tipc_alphabet[] = 
 const char tipc_alphabet[] = 
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_";
+	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_.";
 
 
 /* configurable TIPC parameters */
 /* configurable TIPC parameters */
 
 

+ 6 - 2
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 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
  * 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 {
 struct tipc_skb_cb {
 	void *handle;
 	void *handle;