From patchwork Thu Oct 15 08:54:56 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ursula Braun X-Patchwork-Id: 36102 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 9DF9AB7B7E for ; Thu, 15 Oct 2009 20:10:13 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935067AbZJOJIi (ORCPT ); Thu, 15 Oct 2009 05:08:38 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761786AbZJOJIc (ORCPT ); Thu, 15 Oct 2009 05:08:32 -0400 Received: from mtagate3.de.ibm.com ([195.212.17.163]:38921 "EHLO mtagate3.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756417AbZJOJI2 (ORCPT ); Thu, 15 Oct 2009 05:08:28 -0400 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate3.de.ibm.com (8.13.1/8.13.1) with ESMTP id n9F97oR0006017; Thu, 15 Oct 2009 09:07:50 GMT Received: from d12av02.megacenter.de.ibm.com (d12av02.megacenter.de.ibm.com [9.149.165.228]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id n9F97oQx3391644; Thu, 15 Oct 2009 11:07:50 +0200 Received: from d12av02.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n9F97nVv015902; Thu, 15 Oct 2009 11:07:50 +0200 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n9F97nfC015899; Thu, 15 Oct 2009 11:07:49 +0200 Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 4267) id B914D122422C; Thu, 15 Oct 2009 11:07:49 +0200 (CEST) Message-Id: <20091015090749.638697000@linux.vnet.ibm.com> User-Agent: quilt/0.47-1 Date: Thu, 15 Oct 2009 10:54:56 +0200 From: Ursula Braun To: davem@davemloft.net, netdev@vger.kernel.org, linux-s390@vger.kernel.org Cc: schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, Hendrik Brueckner , Ursula Braun Subject: [patch 2/5] [PATCH] af_iucv: remove duplicate sock_set_flag References: <20091015085454.124154000@linux.vnet.ibm.com> Content-Disposition: inline; filename=602-af_iucv-fallout.diff Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ursula Braun Remove duplicate sock_set_flag(sk, SOCK_ZAPPED) in iucv_sock_close, which has been overlooked in September-commit 7514bab04e567c9408fe0facbde4277f09d5eb74. Cc: Hendrik Brueckner Signed-off-by: Ursula Braun --- net/iucv/af_iucv.c | 1 - 1 file changed, 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-next-uschi/net/iucv/af_iucv.c =================================================================== --- linux-next-uschi.orig/net/iucv/af_iucv.c +++ linux-next-uschi/net/iucv/af_iucv.c @@ -428,7 +428,6 @@ static void iucv_sock_close(struct sock break; default: - sock_set_flag(sk, SOCK_ZAPPED); /* nothing to do here */ break; }