diff options
| author | Richard Cochran <richardcochran@gmail.com> | 2011-06-14 23:55:20 +0000 |
|---|---|---|
| committer | David S. Miller <davem@conan.davemloft.net> | 2011-06-16 23:48:12 -0400 |
| commit | ae6e86b7fb15520ac64513ad643de63e0b077aa5 (patch) | |
| tree | 6de775cb23016792e18428f0266b0e5b662f02a3 | |
| parent | 2331038a96ecdad76c50ab223fd48d656d8a1184 (diff) | |
| download | linux-3.10-ae6e86b7fb15520ac64513ad643de63e0b077aa5.tar.gz linux-3.10-ae6e86b7fb15520ac64513ad643de63e0b077aa5.tar.bz2 linux-3.10-ae6e86b7fb15520ac64513ad643de63e0b077aa5.zip | |
dp83640: drop PHY status frames in the driver.
The dp83640 PHY provides time stamp and other information via special
PHY status frames. Previously, the driver decoded the frames and then
let the network stack drop them. This works fine when the PTP messages
come over UDP.
However, when receiving PTP messages via L2 packets, this creates a
problem. The status frames use the official PTP destination MAC address,
and so they are delivered to user space along with the "real" frames,
causing confusion for applications.
This commit fixes the issue by simply dropping the PHY status frames
in the driver.
Signed-off-by: Richard Cochran <richard.cochran@omicron.at>
Signed-off-by: David S. Miller <davem@conan.davemloft.net>
| -rw-r--r-- | drivers/net/phy/dp83640.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c index ead323e5673..2cd8dc5847b 100644 --- a/drivers/net/phy/dp83640.c +++ b/drivers/net/phy/dp83640.c @@ -1044,8 +1044,8 @@ static bool dp83640_rxtstamp(struct phy_device *phydev, if (is_status_frame(skb, type)) { decode_status_frame(dp83640, skb); - /* Let the stack drop this frame. */ - return false; + kfree_skb(skb); + return true; } SKB_PTP_TYPE(skb) = type; |