net: ptp: fix time stamp matching logic for VLAN packets.
authorRichard Cochran <richardcochran@gmail.com>
Wed, 12 Nov 2014 10:33:52 +0000 (11:33 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 12 Nov 2014 20:06:17 +0000 (15:06 -0500)
commitcca04b2854ecfb7cd1b8ee84ab38bc99af59f526
tree959b8ccb4e8db6ceb080f0163298a9d9faecc758
parentee7bc3cdc2702ba36930d477b76dacd5b18e8956
net: ptp: fix time stamp matching logic for VLAN packets.

Commit ae5c6c6d "ptp: Classify ptp over ip over vlan packets" changed the
code in two drivers that matches time stamps with PTP frames, with the goal
of allowing VLAN tagged PTP packets to receive hardware time stamps.

However, that commit failed to account for the VLAN header when parsing
IPv4 packets. This patch fixes those two drivers to correctly match VLAN
tagged IPv4/UDP PTP messages with their time stamps.

This patch should also be applied to v3.17.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/ti/cpts.c
drivers/net/phy/dp83640.c