aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-09 11:01:19 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-09 11:01:19 -0400
commita8f43ee7e108cecf68cac652d0a3aeedb8131220 (patch)
tree53ddd1ab32f9146453531e3183654045c57d621f
parent91e37a793b5a9436a2d12b2f0a8f52db3a133e1d (diff)
parent36ca34cc3b8335eb1fe8bd9a1d0a2592980c3f02 (diff)
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
-rw-r--r--net/ipv6/sit.c2
-rw-r--r--net/tipc/core.h11
2 files changed, 6 insertions, 7 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 4b2f1033994e..5a6fab95569f 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -596,9 +596,9 @@ static int ipip6_rcv(struct sk_buff *skb)
596 } 596 }
597 597
598 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); 598 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
599 kfree_skb(skb);
600 read_unlock(&ipip6_lock); 599 read_unlock(&ipip6_lock);
601out: 600out:
601 kfree_skb(skb);
602 return 0; 602 return 0;
603} 603}
604 604
diff --git a/net/tipc/core.h b/net/tipc/core.h
index 325404fd4eb5..5a0e4878d3b7 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)
279/* 279/*
280 * TIPC message buffer code 280 * TIPC message buffer code
281 * 281 *
282 * TIPC message buffer headroom reserves space for a link-level header 282 * TIPC message buffer headroom reserves space for the worst-case
283 * (in case the message is sent off-node), 283 * link-level device header (in case the message is sent off-node).
284 * while ensuring TIPC header is word aligned for quicker access
285 * 284 *
286 * The largest header currently supported is 18 bytes, which is used when 285 * Note: Headroom should be a multiple of 4 to ensure the TIPC header fields
287 * the standard 14 byte Ethernet header has 4 added bytes for VLAN info 286 * are word aligned for quicker access
288 */ 287 */
289 288
290#define BUF_HEADROOM 20u 289#define BUF_HEADROOM LL_MAX_HEADER
291 290
292struct tipc_skb_cb { 291struct tipc_skb_cb {
293 void *handle; 292 void *handle;