Commit a8f43ee7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 91e37a79 36ca34cc

net/ipv6/sit.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

net/tipc/core.h

+5 −6
Original line number Diff line number Diff line
@@ -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;