diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-09 15:01:19 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-09 15:01:19 (GMT) |
commit | a8f43ee7e108cecf68cac652d0a3aeedb8131220 (patch) | |
tree | 53ddd1ab32f9146453531e3183654045c57d621f /net | |
parent | 91e37a793b5a9436a2d12b2f0a8f52db3a133e1d (diff) | |
parent | 36ca34cc3b8335eb1fe8bd9a1d0a2592980c3f02 (diff) | |
download | linux-a8f43ee7e108cecf68cac652d0a3aeedb8131220.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
sit: Add missing kfree_skb() on pskb_may_pull() failure.
tipc: Increase buffer header to support worst-case device
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv6/sit.c | 2 | ||||
-rw-r--r-- | net/tipc/core.h | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 4b2f103..5a6fab9 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -596,9 +596,9 @@ static int ipip6_rcv(struct sk_buff *skb) } icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); - kfree_skb(skb); read_unlock(&ipip6_lock); out: + kfree_skb(skb); return 0; } diff --git a/net/tipc/core.h b/net/tipc/core.h index 325404f..5a0e487 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; |