summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Stephens <allan.stephens@windriver.com>2008-05-08 21:38:24 -0700
committerDavid S. Miller <davem@davemloft.net>2008-05-08 21:38:24 -0700
commitf08269d3ecbb9300aeeb2d4272580f660afe9db9 (patch)
tree3f4a0e8e0cfabce35ccb34c268726cd95f0109ba
parente46b66bc42b6b1430b04cc5c207ecb2b2f4553dc (diff)
tipc: Increase buffer header to support worst-case device
This patch increases the headroom TIPC reserves in each sk_buff to accommodate the largest possible link level device header. Signed-off-by: Allan Stephens <allan.stephens@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/tipc/core.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/net/tipc/core.h b/net/tipc/core.h
index 325404fd4eb..5a0e4878d3b 100644
--- a/net/tipc/core.h
+++ b/net/tipc/core.h
@@ -279,15 +279,14 @@ static inline void k_term_timer(struct timer_list *timer)
/*
* TIPC message buffer code
*
- * 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
+ * TIPC message buffer headroom reserves space for the worst-case
+ * link-level device header (in case the message is sent off-node).
*
- * 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
+ * Note: Headroom should be a multiple of 4 to ensure the TIPC header fields
+ * are word aligned for quicker access
*/
-#define BUF_HEADROOM 20u
+#define BUF_HEADROOM LL_MAX_HEADER
struct tipc_skb_cb {
void *handle;