diff options
| author | Richard Cochran <richardcochran@gmail.com> | 2011-10-21 00:49:17 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-11 09:35:51 -0800 |
| commit | 806aeb924e925e6f1584ff956c9b9695e4ec18f9 (patch) | |
| tree | 0c74d33bee9cf00092c12a074422fb334e579d9b /drivers/net/phy/dp83640.c | |
| parent | 32779fa06584fdcab2228a36c3a846fa0a6f5cdb (diff) | |
| download | kernel_samsung_smdk4412-806aeb924e925e6f1584ff956c9b9695e4ec18f9.zip kernel_samsung_smdk4412-806aeb924e925e6f1584ff956c9b9695e4ec18f9.tar.gz kernel_samsung_smdk4412-806aeb924e925e6f1584ff956c9b9695e4ec18f9.tar.bz2 | |
dp83640: free packet queues on remove
commit 8b3408f8ee994973869d8ba32c5bf482bc4ddca4 upstream.
If the PHY should disappear (for example, on an USB Ethernet MAC), then
the driver would leak any undelivered time stamp packets. This commit
fixes the issue by calling the appropriate functions to free any packets
left in the transmit and receive queues.
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>
Diffstat (limited to 'drivers/net/phy/dp83640.c')
| -rw-r--r-- | drivers/net/phy/dp83640.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c index cb6e0b4..db659c5 100644 --- a/drivers/net/phy/dp83640.c +++ b/drivers/net/phy/dp83640.c @@ -875,6 +875,7 @@ static void dp83640_remove(struct phy_device *phydev) struct dp83640_clock *clock; struct list_head *this, *next; struct dp83640_private *tmp, *dp83640 = phydev->priv; + struct sk_buff *skb; if (phydev->addr == BROADCAST_ADDR) return; @@ -882,6 +883,12 @@ static void dp83640_remove(struct phy_device *phydev) enable_status_frames(phydev, false); cancel_work_sync(&dp83640->ts_work); + while ((skb = skb_dequeue(&dp83640->rx_queue)) != NULL) + kfree_skb(skb); + + while ((skb = skb_dequeue(&dp83640->tx_queue)) != NULL) + skb_complete_tx_timestamp(skb, NULL); + clock = dp83640_clock_get(dp83640->clock); if (dp83640 == clock->chosen) { |