diff options
| author | Richard Cochran <richardcochran@gmail.com> | 2011-10-20 20:49:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-11 12:37:18 -0500 |
| commit | ed288aed0796683495c51684d56f9328813c59c7 (patch) | |
| tree | d2818b6b4e3b996f208e87a72e941dce84a90b45 | |
| parent | 6dd160db729a0c96cc640a848e6df88ca6c19d2a (diff) | |
dp83640: use proper function to free transmit time stamping packets
commit f5ff7cd1a84caa9545d952a37ac872ccb73825fb upstream.
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/net/phy/dp83640.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c index db659c5f0fe..364cd67bb70 100644 --- a/drivers/net/phy/dp83640.c +++ b/drivers/net/phy/dp83640.c | |||
| @@ -1067,7 +1067,7 @@ static void dp83640_txtstamp(struct phy_device *phydev, | |||
| 1067 | struct dp83640_private *dp83640 = phydev->priv; | 1067 | struct dp83640_private *dp83640 = phydev->priv; |
| 1068 | 1068 | ||
| 1069 | if (!dp83640->hwts_tx_en) { | 1069 | if (!dp83640->hwts_tx_en) { |
| 1070 | kfree_skb(skb); | 1070 | skb_complete_tx_timestamp(skb, NULL); |
| 1071 | return; | 1071 | return; |
| 1072 | } | 1072 | } |
| 1073 | skb_queue_tail(&dp83640->tx_queue, skb); | 1073 | skb_queue_tail(&dp83640->tx_queue, skb); |