GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-11 00:51:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Browse source 
* 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
This commit is contained in:
Linus Torvalds 2008-05-09 08:01:19 -07:00
commit a8f43ee7e1
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
net/ipv6/sit.c
View file

@ -596,9 +596,9 @@ static int ipip6_rcv(struct sk_buff *skb)
} }
icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
kfree_skb(skb);
read_unlock(&ipip6_lock); read_unlock(&ipip6_lock);
out: out:
kfree_skb(skb);
return 0; return 0;
} }

11
net/tipc/core.h
View file

@ -279,15 +279,14 @@ static inline void k_term_timer(struct timer_list *timer)
/* /*
* TIPC message buffer code * TIPC message buffer code
* *
* TIPC message buffer headroom reserves space for a link-level header * TIPC message buffer headroom reserves space for the worst-case
* (in case the message is sent off-node), * link-level device header (in case the message is sent off-node).
* while ensuring TIPC header is word aligned for quicker access
* *
* The largest header currently supported is 18 bytes, which is used when * Note: Headroom should be a multiple of 4 to ensure the TIPC header fields
* the standard 14 byte Ethernet header has 4 added bytes for VLAN info * are word aligned for quicker access
*/ */
#define BUF_HEADROOM 20u #define BUF_HEADROOM LL_MAX_HEADER
struct tipc_skb_cb { struct tipc_skb_cb {
void *handle; void *handle;