From 1dbe8b586aa262a0236610a1f27934b56ad327a5 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Wed, 16 Jul 2008 20:07:06 -0700 Subject: [PATCH] --- yaml --- r: 103555 b: refs/heads/master c: 885a4c966bcc11a1470c2b85a90360f6518a507a h: refs/heads/master i: 103553: cb1cc195e5492ec48dde3587fa4f7156b37a3e6e 103551: 70376bb5fe96b40392ba9297195150ff4fe8a94d v: v3 --- [refs] | 2 +- trunk/net/ipv4/ipvs/ip_vs_core.c | 3 ++- trunk/net/iucv/iucv.c | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 73f32a85aca4..fb8b5bbeaa12 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 375c6bbabf210ded3151481ca1ac7f730903512b +refs/heads/master: 885a4c966bcc11a1470c2b85a90360f6518a507a diff --git a/trunk/net/ipv4/ipvs/ip_vs_core.c b/trunk/net/ipv4/ipvs/ip_vs_core.c index bcf6276ba4b2..a7879eafc3b5 100644 --- a/trunk/net/ipv4/ipvs/ip_vs_core.c +++ b/trunk/net/ipv4/ipvs/ip_vs_core.c @@ -991,7 +991,8 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, == sysctl_ip_vs_sync_threshold[0])) || ((cp->protocol == IPPROTO_TCP) && (cp->old_state != cp->state) && ((cp->state == IP_VS_TCP_S_FIN_WAIT) || - (cp->state == IP_VS_TCP_S_CLOSE))))) + (cp->state == IP_VS_TCP_S_CLOSE_WAIT) || + (cp->state == IP_VS_TCP_S_TIME_WAIT))))) ip_vs_sync_conn(cp); cp->old_state = cp->state; diff --git a/trunk/net/iucv/iucv.c b/trunk/net/iucv/iucv.c index 531a206ce7a6..d8e0635aace0 100644 --- a/trunk/net/iucv/iucv.c +++ b/trunk/net/iucv/iucv.c @@ -567,8 +567,11 @@ static int __cpuinit iucv_cpu_notify(struct notifier_block *self, return NOTIFY_BAD; iucv_param[cpu] = kmalloc_node(sizeof(union iucv_param), GFP_KERNEL|GFP_DMA, cpu_to_node(cpu)); - if (!iucv_param[cpu]) + if (!iucv_param[cpu]) { + kfree(iucv_irq_data[cpu]); + iucv_irq_data[cpu] = NULL; return NOTIFY_BAD; + } break; case CPU_UP_CANCELED: case CPU_UP_CANCELED_FROZEN: