Message ID | 966b346f5f73c0afc48f89686e9ed1f44457074b.1319193734.git.richard.cochran@omicron.at |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Richard Cochran <richardcochran@gmail.com> 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 <richard.cochran@omicron.at> > Acked-by: Eric Dumazet <eric.dumazet@gmail.com> > Cc: <stable@vger.kernel.org> 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. -- 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
On Mon, Oct 24, 2011 at 02:55:55AM -0400, David Miller wrote: > From: Richard Cochran <richardcochran@gmail.com> > 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 <richard.cochran@omicron.at> > > Acked-by: Eric Dumazet <eric.dumazet@gmail.com> > > Cc: <stable@vger.kernel.org> > > 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? Thanks, Richard -- 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
From: Richard Cochran <richardcochran@gmail.com> 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 <richardcochran@gmail.com> >> 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 <richard.cochran@omicron.at> >> > Acked-by: Eric Dumazet <eric.dumazet@gmail.com> >> > Cc: <stable@vger.kernel.org> >> >> 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. -- 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
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c index c588a16..13e5713 100644 --- a/drivers/net/phy/dp83640.c +++ b/drivers/net/phy/dp83640.c @@ -1192,7 +1192,7 @@ static void dp83640_txtstamp(struct phy_device *phydev, case HWTSTAMP_TX_ONESTEP_SYNC: if (is_sync(skb, type)) { - kfree_skb(skb); + skb_complete_tx_timestamp(skb, NULL); return; } /* fall through */ @@ -1203,7 +1203,7 @@ static void dp83640_txtstamp(struct phy_device *phydev, case HWTSTAMP_TX_OFF: default: - kfree_skb(skb); + skb_complete_tx_timestamp(skb, NULL); break; } }