aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Cochran <richardcochran@gmail.com>2011-10-20 20:49:16 -0400
committerDavid S. Miller <davem@davemloft.net>2011-10-24 19:14:50 -0400
commitf5ff7cd1a84caa9545d952a37ac872ccb73825fb (patch)
tree13d027308cfd1e3557a7824f6af48eb761e390a1
parent9f56220fad0d13f8b0ebe7592f41fdb49874d143 (diff)
dp83640: use proper function to free transmit time stamping packets
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> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/phy/dp83640.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
index c588a162050f..13e571325a9c 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,
1192 1192
1193 case HWTSTAMP_TX_ONESTEP_SYNC: 1193 case HWTSTAMP_TX_ONESTEP_SYNC:
1194 if (is_sync(skb, type)) { 1194 if (is_sync(skb, type)) {
1195 kfree_skb(skb); 1195 skb_complete_tx_timestamp(skb, NULL);
1196 return; 1196 return;
1197 } 1197 }
1198 /* fall through */ 1198 /* fall through */
@@ -1203,7 +1203,7 @@ static void dp83640_txtstamp(struct phy_device *phydev,
1203 1203
1204 case HWTSTAMP_TX_OFF: 1204 case HWTSTAMP_TX_OFF:
1205 default: 1205 default:
1206 kfree_skb(skb); 1206 skb_complete_tx_timestamp(skb, NULL);
1207 break; 1207 break;
1208 } 1208 }
1209} 1209}