From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: [PATCH v2 2/3] dp83640: use proper function to free transmit time stamping packets Date: Mon, 24 Oct 2011 19:16:51 -0400 (EDT) Message-ID: <20111024.191651.693676079385155765.davem@davemloft.net> References: <966b346f5f73c0afc48f89686e9ed1f44457074b.1319193734.git.richard.cochran@omicron.at> <20111024.025555.265760947744724258.davem@davemloft.net> <20111024174724.GA1954@netboy.at.omicron.at> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, eric.dumazet@gmail.com, johannes@sipsolutions.net, stable@vger.kernel.org To: richardcochran@gmail.com Return-path: Received: from shards.monkeyblade.net ([198.137.202.13]:41878 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754690Ab1JXXR6 (ORCPT ); Mon, 24 Oct 2011 19:17:58 -0400 In-Reply-To: <20111024174724.GA1954@netboy.at.omicron.at> Sender: netdev-owner@vger.kernel.org List-ID: From: Richard Cochran Date: Mon, 24 Oct 2011 19:47:25 +0200 > On Mon, Oct 24, 2011 at 02:55:55AM -0400, David Miller wrote: >> From: Richard Cochran >> Date: Fri, 21 Oct 2011 12:49:16 +0200 >> >> > The previous commit enforces a new rule for handling the cloned packets >> > for transmit time stamping. These packets must not be freed using any other >> > function than skb_complete_tx_timestamp. This commit fixes the one and only >> > driver using this API. >> > >> > The driver first appeared in v3.0. >> > >> > Signed-off-by: Richard Cochran >> > Acked-by: Eric Dumazet >> > Cc: >> >> In the 'net' tree, which is where you should be targetting these dp83640 >> driver patches, the code looks nothing like what you're patching against. >> >> Please respin patches #2 and #3 against current sources. > > Okay, but #2 will conflict with > > dccaa9e0 dp83640: add time stamp insertion for sync messages > > in net-next. Should I also submit a fix for that one? Ok. I'll just apply those original 2 patches to net-next since Linus release 3.1 today already. Thanks.