From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: [net PATCH] atl1e: unmap partially mapped skb on dma error and free skb Date: Tue, 16 Jul 2013 12:11:25 -0700 (PDT) Message-ID: <20130716.121125.1312991211924388920.davem@davemloft.net> References: <1373986181-15797-1-git-send-email-nhorman@tuxdriver.com> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, bhutchings@solarflare.com, jcliburn@gmail.com, chris.snook@gmail.com To: nhorman@tuxdriver.com Return-path: Received: from shards.monkeyblade.net ([149.20.54.216]:39168 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933253Ab3GPTL2 (ORCPT ); Tue, 16 Jul 2013 15:11:28 -0400 In-Reply-To: <1373986181-15797-1-git-send-email-nhorman@tuxdriver.com> Sender: netdev-owner@vger.kernel.org List-ID: From: Neil Horman Date: Tue, 16 Jul 2013 10:49:41 -0400 > Ben Hutchings pointed out that my recent update to atl1e: > > commit 352900b583b2852152a1e05ea0e8b579292e731e > Author: Neil Horman > Date: Fri Jul 12 10:58:48 2013 -0400 > > atl1e: fix dma mapping warnings > > Was missing a bit of code. Specifically it reset the hardware tx ring to its > origional state when we hit a dma error, but didn't unmap any exiting mappings > from the operation. This patch fixes that up. It also remembers to free the > skb in the event that an error occurs, so we don't leak. Untested, as I don't > have hardware. I think its pretty straightforward, but please review closely. > > Signed-off-by: Neil Horman Applied, but please refer to commits in the form "$SHA1ID ("Commit message header line")", I fixed it up for you this time.