From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934559Ab3DKUy2 (ORCPT ); Thu, 11 Apr 2013 16:54:28 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:8535 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754052Ab3DKUyZ (ORCPT ); Thu, 11 Apr 2013 16:54:25 -0400 X-Authority-Analysis: v=2.0 cv=C51rOHz+ c=1 sm=0 a=rXTBtCOcEpjy1lPqhTCpEQ==:17 a=mNMOxpOpBa8A:10 a=HEz99ifgi9oA:10 a=5SG0PmZfjMsA:10 a=IkcTkHD0fZMA:10 a=meVymXHHAAAA:8 a=DrLfaR0XGykA:10 a=zRKbQ67AAAAA:8 a=oCcaPWc0AAAA:8 a=RPBl_eEhWv1HL4lVxjsA:9 a=QEXdDO2ut3YA:10 a=1Dwx9gnmAe4A:10 a=rXTBtCOcEpjy1lPqhTCpEQ==:117 X-Cloudmark-Score: 0 X-Authenticated-User: X-Originating-IP: 74.67.115.198 Message-ID: <1365713664.9609.60.camel@gandalf.local.home> Subject: Re: [ 024/171 ] sfc: lock TX queues when calling netif_device_detach() From: Steven Rostedt To: Ben Hutchings Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org Date: Thu, 11 Apr 2013 16:54:24 -0400 In-Reply-To: <1365712962.7355.27.camel@bwh-desktop.uk.solarflarecom.com> References: <20130411202503.783159048@goodmis.org> <20130411202550.143721907@goodmis.org> <1365712962.7355.27.camel@bwh-desktop.uk.solarflarecom.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.4.4-2 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2013-04-11 at 21:42 +0100, Ben Hutchings wrote: > On Thu, 2013-04-11 at 16:25 -0400, Steven Rostedt wrote: > > > 3.6.11.2 stable review patch. > > If anyone has any objections, please let me know. > > > > ------------------ > > > > From: Daniel Pieczko > > > > [ Upstream commit c2f3b8e3a44b6fe9e36704e30157ebe1a88c08b1 ] > > > > The assertion of netif_device_present() at the top of > > efx_hard_start_xmit() may fail if we don't do this. > > You should also cherry-pick commit 35205b211c8d 'sfc: Disable soft > interrupt handling during efx_device_detach_sync()' on top of this. > Hmm, I had that in my quilt queue, but commented it out. I guess it didn't apply well, and it was a bit too much to back port blindly. I'll take another look. Thanks, -- Steve