mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge branch 'net-2.6-misc-20080605a' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-fix
This commit is contained in:
commit
aed5a833fb
17 changed files with 146 additions and 97 deletions
|
|
@ -97,7 +97,7 @@ static int tunnel64_rcv(struct sk_buff *skb)
|
|||
{
|
||||
struct xfrm_tunnel *handler;
|
||||
|
||||
if (!pskb_may_pull(skb, sizeof(struct iphdr)))
|
||||
if (!pskb_may_pull(skb, sizeof(struct ipv6hdr)))
|
||||
goto drop;
|
||||
|
||||
for (handler = tunnel64_handlers; handler; handler = handler->next)
|
||||
|
|
|
|||
|
|
@ -420,7 +420,7 @@ void udp_err(struct sk_buff *skb, u32 info)
|
|||
/*
|
||||
* Throw away all pending data and cancel the corking. Socket is locked.
|
||||
*/
|
||||
static void udp_flush_pending_frames(struct sock *sk)
|
||||
void udp_flush_pending_frames(struct sock *sk)
|
||||
{
|
||||
struct udp_sock *up = udp_sk(sk);
|
||||
|
||||
|
|
@ -430,6 +430,7 @@ static void udp_flush_pending_frames(struct sock *sk)
|
|||
ip_flush_pending_frames(sk);
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL(udp_flush_pending_frames);
|
||||
|
||||
/**
|
||||
* udp4_hwcsum_outgoing - handle outgoing HW checksumming
|
||||
|
|
|
|||
Loading…
Reference in a new issue