Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -1341,15 +1341,15 @@ static bool dp83640_rxtstamp(struct phy_device *phydev,
|
||||
{
|
||||
struct dp83640_private *dp83640 = phydev->priv;
|
||||
|
||||
if (!dp83640->hwts_rx_en)
|
||||
return false;
|
||||
|
||||
if (is_status_frame(skb, type)) {
|
||||
decode_status_frame(dp83640, skb);
|
||||
kfree_skb(skb);
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!dp83640->hwts_rx_en)
|
||||
return false;
|
||||
|
||||
SKB_PTP_TYPE(skb) = type;
|
||||
skb_queue_tail(&dp83640->rx_queue, skb);
|
||||
schedule_work(&dp83640->ts_work);
|
||||
|
Reference in New Issue
Block a user